aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-02-10 23:19:06 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-02-10 23:19:06 (GMT)
commit4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3 (patch)
tree8d8f13ca42a50bfdbac464e04c53a44d9f962d05
parentrepoman: remove redundant config constructor (diff)
downloadportage-4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3.zip
portage-4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3.tar.gz
portage-4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3.tar.bz2
repoman: support PORTAGE_CONFIGROOT, bug 402577
-rwxr-xr-xbin/repoman6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 7edeb65..32111bd 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -95,7 +95,8 @@ os.umask(0o22)
# behave incrementally.
repoman_incrementals = tuple(x for x in \
portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
-repoman_settings = portage.config(local_config=False)
+config_root = os.environ.get("PORTAGE_CONFIGROOT")
+repoman_settings = portage.config(config_root=config_root, local_config=False)
if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
repoman_settings.get('TERM') == 'dumb' or \
@@ -563,7 +564,7 @@ repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % \
portage._shell_quote(portdir_overlay))
# We have to call the config constructor again so
# that config.repositories is initialized correctly.
-repoman_settings = portage.config(local_config=False,
+repoman_settings = portage.config(config_root=config_root, local_config=False,
env=dict(os.environ, PORTDIR_OVERLAY=repoman_settings['PORTDIR_OVERLAY']))
root = repoman_settings['EROOT']
@@ -2004,6 +2005,7 @@ for x in effective_scanlist:
dep_settings = portage.config(
config_profile_path=prof.abs_path,
config_incrementals=repoman_incrementals,
+ config_root=config_root,
local_config=False,
_unmatched_removal=options.unmatched_removal,
env=env)