initialise config() with _eprefix set to the configured portage.const.EPREFIX val
authorFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 11:58:16 +0000 (13:58 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 11:58:16 +0000 (13:58 +0200)
bin/repoman

index e892bf329decac5162220cf4954b56546aaeb73a..361ea46fca785f45871e9aa89b5eb7f0441bd771 100755 (executable)
@@ -79,6 +79,7 @@ from portage.package.ebuild.digestgen import digestgen
 from portage.eapi import eapi_has_slot_deps, \
        eapi_has_use_deps, eapi_has_strong_blocks, eapi_has_iuse_defaults, \
        eapi_has_required_use, eapi_has_use_dep_defaults
+from portage.const import EPREFIX
 
 if sys.hexversion >= 0x3000000:
        basestring = str
@@ -98,7 +99,7 @@ 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)
+repoman_settings = portage.config(local_config=False, _eprefix=EPREFIX)
 repoman_settings.lock()
 
 if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
@@ -559,7 +560,7 @@ 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)
+repoman_settings = portage.config(local_config=False, _eprefix=EPREFIX)
 repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % \
        (repoman_settings.get('PORTDIR_OVERLAY', ''), portdir_overlay)
 repoman_settings.backup_changes('PORTDIR_OVERLAY')
@@ -1822,7 +1823,8 @@ for x in scanlist:
                                                config_profile_path=prof.abs_path,
                                                config_incrementals=repoman_incrementals,
                                                local_config=False,
-                                               env=env)
+                                               env=env,
+                                               _eprefix=EPREFIX)
                                        if options.without_mask:
                                                dep_settings._mask_manager = \
                                                        copy.deepcopy(dep_settings._mask_manager)