From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1126713838B for ; Mon, 29 Sep 2014 22:27:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E959E08BD; Mon, 29 Sep 2014 22:27:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E83FE08BD for ; Mon, 29 Sep 2014 22:27:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E7CD34022B for ; Mon, 29 Sep 2014 22:27:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 444685D9 for ; Mon, 29 Sep 2014 22:27:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1412029595.02ed485976fbf88a548c7b83978e23e3b50f41a2.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/__init__.py X-VCS-Directories: pym/portage/tests/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 02ed485976fbf88a548c7b83978e23e3b50f41a2 X-VCS-Branch: master Date: Mon, 29 Sep 2014 22:27:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 35865790-fd7f-40d4-9850-72a74342b8a1 X-Archives-Hash: 20e4d6913856e20a59279e1b6751f0cf commit: 02ed485976fbf88a548c7b83978e23e3b50f41a2 Author: Brian Dolbec gentoo org> AuthorDate: Mon Sep 29 21:48:20 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Sep 29 22:26:35 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=02ed4859 Fix travis test failures due to setup.py installing future sbin scripts in bindir --- pym/portage/tests/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index 708dd59..afa57e3 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -197,7 +197,9 @@ class TestCase(unittest.TestCase): self.cnf_path = cnf_path self.cnf_etc_path = cnf_etc_path self.bindir = cnf_bindir - self.sbindir = cnf_sbindir + # sbin scripts are installed by setup.py to the bindir + # they are relocated to /usr/sbin dir by the ebuild later + self.sbindir = self.bindir def defaultTestResult(self): return TextTestResult()