diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-12-10 10:45:20 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 10:45:20 -0800 |
commit | c37d0c55ac3f70586afcad86636973de35eabe4e (patch) | |
tree | a14197b4b1a14e8fb6ffc3597a19ea23bef7cb52 /bin/repoman | |
parent | cacbbe33b839737fecff2b81fc638bb40f08686c (diff) | |
download | portage-c37d0c55ac3f70586afcad86636973de35eabe4e.tar.gz portage-c37d0c55ac3f70586afcad86636973de35eabe4e.tar.bz2 portage-c37d0c55ac3f70586afcad86636973de35eabe4e.zip |
Remove redundant eprefix in config constructors.
Since commit 11a7448f1d5a0bfb38f8de9d66a8fa8d7118c877, the config
constructor uses portage.const.EPREFIX by default.
Diffstat (limited to 'bin/repoman')
-rwxr-xr-x | bin/repoman | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/repoman b/bin/repoman index 24e8f77b6..43270f9e8 100755 --- a/bin/repoman +++ b/bin/repoman @@ -95,8 +95,7 @@ os.umask(0o22) # behave incrementally. repoman_incrementals = tuple(x for x in \ portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') -eprefix = portage.const.EPREFIX -repoman_settings = portage.config(local_config=False, eprefix=eprefix) +repoman_settings = portage.config(local_config=False) repoman_settings.lock() if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ @@ -565,13 +564,13 @@ if options.mode == 'commit' and not options.pretend and not vcs: options.pretend = True # Ensure that PORTDIR_OVERLAY contains the repository corresponding to $PWD. -repoman_settings = portage.config(local_config=False, eprefix=eprefix) +repoman_settings = portage.config(local_config=False) repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % \ (repoman_settings.get('PORTDIR_OVERLAY', ''), 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, eprefix=eprefix, +repoman_settings = portage.config(local_config=False, env=dict(os.environ, PORTDIR_OVERLAY=repoman_settings['PORTDIR_OVERLAY'])) root = repoman_settings['EROOT'] @@ -2005,7 +2004,7 @@ for x in effective_scanlist: config_incrementals=repoman_incrementals, local_config=False, _unmatched_removal=options.unmatched_removal, - env=env, eprefix=eprefix) + env=env) dep_settings.categories = repoman_settings.categories if options.without_mask: dep_settings._mask_manager = \ |