diff options
| -rwxr-xr-x | bin/egencache | 6 | ||||
| -rwxr-xr-x | bin/repoman | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/bin/egencache b/bin/egencache index 6d18f66e5..7a87bb62c 100755 --- a/bin/egencache +++ b/bin/egencache @@ -841,10 +841,8 @@ def egencache_main(args): if options.portdir is not None: env['PORTDIR'] = options.portdir - eprefix = portage.const.EPREFIX - settings = portage.config(config_root=config_root, - local_config=False, env=env, eprefix=eprefix) + local_config=False, env=env) default_opts = None if not options.ignore_default_opts: @@ -857,7 +855,7 @@ def egencache_main(args): env['PORTAGE_DEPCACHEDIR'] = options.cache_dir settings = portage.config(config_root=config_root, - local_config=False, env=env, eprefix=eprefix) + local_config=False, env=env) if not options.update and not options.update_use_local_desc \ and not options.update_changelogs: 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 = \ |