aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-04-06 17:32:43 -0700
committerZac Medico <zmedico@gentoo.org>2018-04-06 18:42:01 -0700
commit1733e574716d2e904dcd9b0338a61fbfe0a798e7 (patch)
tree71c57e5aa08d60ada0819b17236238e4b53c1a41 /repoman
parentportage.util.elf.constants: Update URL for elfutils header. (diff)
downloadportage-1733e574716d2e904dcd9b0338a61fbfe0a798e7.tar.gz
portage-1733e574716d2e904dcd9b0338a61fbfe0a798e7.tar.bz2
portage-1733e574716d2e904dcd9b0338a61fbfe0a798e7.zip
ResolverPlayground: create ${EPREFIX}/usr/share/repoman
This solves the following issue when running the tests with an installed instance of repoman like we do in travis: testSimple (repoman.tests.simple.test_simple.SimpleRepomanTestCase) ... Traceback (most recent call last): File "/usr/bin/repoman", line 44, in <module> repoman_main(sys.argv[1:]) File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/repoman/main.py", line 95, in repoman_main repoman_settings, vcs_settings, options, qadata) File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/repoman/repos.py", line 56, in __init__ if not self.qadata.load_repo_config(self.masters_list, options, repoman_settings.valid_versions): File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/repoman/qa_data.py", line 46, in load_repo_config repomanpaths = [os.path.join(cnfdir, _file_) for _file_ in os.listdir(cnfdir)] OSError: [Errno 2] No such file or directory: '/tmp/tmpWkrEvP/usr/share/repoman/qa_data'
Diffstat (limited to 'repoman')
-rw-r--r--repoman/pym/repoman/tests/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/repoman/pym/repoman/tests/__init__.py b/repoman/pym/repoman/tests/__init__.py
index 3421493f4..d57ca9b10 100644
--- a/repoman/pym/repoman/tests/__init__.py
+++ b/repoman/pym/repoman/tests/__init__.py
@@ -33,11 +33,14 @@ from portage.const import EPREFIX, GLOBAL_CONFIG_PATH, PORTAGE_BIN_PATH
if repoman._not_installed:
cnf_path = os.path.join(REPOMAN_BASE_PATH, 'cnf')
+ cnf_path_repoman = cnf_path
cnf_etc_path = cnf_path
cnf_bindir = os.path.join(REPOMAN_BASE_PATH, 'bin')
cnf_sbindir = cnf_bindir
else:
cnf_path = os.path.join(EPREFIX or '/', GLOBAL_CONFIG_PATH)
+ cnf_path_repoman = os.path.join(EPREFIX or '/',
+ sys.prefix.lstrip(os.sep), 'share', 'repoman')
cnf_etc_path = os.path.join(EPREFIX or '/', 'etc')
cnf_eprefix = EPREFIX
cnf_bindir = os.path.join(EPREFIX or '/', 'usr', 'bin')