| 1 |
commit: 02ed485976fbf88a548c7b83978e23e3b50f41a2 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 29 21:48:20 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Sep 29 22:26:35 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=02ed4859 |
| 7 |
|
| 8 |
Fix travis test failures due to setup.py installing future sbin scripts in bindir |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/__init__.py | 4 +++- |
| 12 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py |
| 15 |
index 708dd59..afa57e3 100644 |
| 16 |
--- a/pym/portage/tests/__init__.py |
| 17 |
+++ b/pym/portage/tests/__init__.py |
| 18 |
@@ -197,7 +197,9 @@ class TestCase(unittest.TestCase): |
| 19 |
self.cnf_path = cnf_path |
| 20 |
self.cnf_etc_path = cnf_etc_path |
| 21 |
self.bindir = cnf_bindir |
| 22 |
- self.sbindir = cnf_sbindir |
| 23 |
+ # sbin scripts are installed by setup.py to the bindir |
| 24 |
+ # they are relocated to /usr/sbin dir by the ebuild later |
| 25 |
+ self.sbindir = self.bindir |
| 26 |
|
| 27 |
def defaultTestResult(self): |
| 28 |
return TextTestResult() |
Archives