From b8a22d672a309976fcdc856269921a32414fdac5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Dec 2011 22:13:29 -0800 Subject: config: make eprefix constructor parameter public --- bin/repoman | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index 6ea15678d..24e8f77b6 100755 --- a/bin/repoman +++ b/bin/repoman @@ -96,7 +96,7 @@ os.umask(0o22) 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, eprefix=eprefix) repoman_settings.lock() if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ @@ -565,13 +565,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, eprefix=eprefix) 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, eprefix=eprefix, env=dict(os.environ, PORTDIR_OVERLAY=repoman_settings['PORTDIR_OVERLAY'])) root = repoman_settings['EROOT'] @@ -2005,7 +2005,7 @@ for x in effective_scanlist: config_incrementals=repoman_incrementals, local_config=False, _unmatched_removal=options.unmatched_removal, - env=env, _eprefix=eprefix) + env=env, eprefix=eprefix) dep_settings.categories = repoman_settings.categories if options.without_mask: dep_settings._mask_manager = \ -- cgit v1.2.3-1-g7c22