From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:07:16 +0000 (-0000)
Subject: Pass the correct PORTDIR_OVERLAY value into the profile-specific config
X-Git-Tag: v2.1.6.12~82
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17584e6a2bea0f2c77944c57fa9aa71f3d29699c;p=portage.git

Pass the correct PORTDIR_OVERLAY value into the profile-specific config
constructor calls. (trunk r13326)

svn path=/main/branches/2.1.6/; revision=13491
---

diff --git a/bin/repoman b/bin/repoman
index adfe987ce..e1af1c749 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -498,9 +498,14 @@ repo_info = portdb._repo_info[portdir_overlay]
 portdb.porttrees = list(repo_info.eclass_db.porttrees)
 portdir = portdb.porttrees[0]
 
+# Generate an appropriate PORTDIR_OVERLAY value for passing into the
+# profile-specific config constructor calls.
+env = os.environ.copy()
+env['PORTDIR_OVERLAY'] = ' '.join(portdb.porttrees[1:])
+
 logging.info('Setting paths:')
 logging.info('PORTDIR = "' + portdir + '"')
-logging.info('PORTDIR_OVERLAY = "%s"' % ' '.join(portdb.porttrees[1:]))
+logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY'])
 
 portdb.mysettings = repoman_settings
 root_config = RootConfig(repoman_settings, trees[root], None)
@@ -1529,7 +1534,8 @@ for x in scanlist:
 					dep_settings = portage.config(
 						config_profile_path=profdir,
 						config_incrementals=portage.const.INCREMENTALS,
-						local_config=False)
+						local_config=False,
+						env=env)
 					if options.without_mask:
 						dep_settings.pmaskdict.clear()
 					arch_caches[prof[0]] = dep_settings