| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:07:16 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13491 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/repoman |
| 7 |
Log: |
| 8 |
Pass the correct PORTDIR_OVERLAY value into the profile-specific config |
| 9 |
constructor calls. (trunk r13326) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/repoman |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/repoman 2009-04-30 07:06:46 UTC (rev 13490) |
| 14 |
+++ main/branches/2.1.6/bin/repoman 2009-04-30 07:07:16 UTC (rev 13491) |
| 15 |
@@ -498,9 +498,14 @@ |
| 16 |
portdb.porttrees = list(repo_info.eclass_db.porttrees) |
| 17 |
portdir = portdb.porttrees[0] |
| 18 |
|
| 19 |
+# Generate an appropriate PORTDIR_OVERLAY value for passing into the |
| 20 |
+# profile-specific config constructor calls. |
| 21 |
+env = os.environ.copy() |
| 22 |
+env['PORTDIR_OVERLAY'] = ' '.join(portdb.porttrees[1:]) |
| 23 |
+ |
| 24 |
logging.info('Setting paths:') |
| 25 |
logging.info('PORTDIR = "' + portdir + '"') |
| 26 |
-logging.info('PORTDIR_OVERLAY = "%s"' % ' '.join(portdb.porttrees[1:])) |
| 27 |
+logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY']) |
| 28 |
|
| 29 |
portdb.mysettings = repoman_settings |
| 30 |
root_config = RootConfig(repoman_settings, trees[root], None) |
| 31 |
@@ -1529,7 +1534,8 @@ |
| 32 |
dep_settings = portage.config( |
| 33 |
config_profile_path=profdir, |
| 34 |
config_incrementals=portage.const.INCREMENTALS, |
| 35 |
- local_config=False) |
| 36 |
+ local_config=False, |
| 37 |
+ env=env) |
| 38 |
if options.without_mask: |
| 39 |
dep_settings.pmaskdict.clear() |
| 40 |
arch_caches[prof[0]] = dep_settings |
Archives