diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-01 08:39:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-01 08:39:33 +0000 |
| commit | 70febaa9a8cd683ed00fa6643599d463150770e1 (patch) | |
| tree | a3923de8ecb24f2d9a0403979c36312d14f7a4da /pym/portage.py | |
| parent | b257d49f7351ebaf6ab0e59bd9a8650f309f227d (diff) | |
| download | portage-70febaa9a8cd683ed00fa6643599d463150770e1.tar.gz portage-70febaa9a8cd683ed00fa6643599d463150770e1.tar.bz2 portage-70febaa9a8cd683ed00fa6643599d463150770e1.zip | |
In create_trees(), when isolating the environment of the ROOT=/ config,
use it's env.d keys as a blacklist to make env.d override the calling
environment. (trunk r8785)
svn path=/main/branches/2.1.2/; revision=8786
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 75ba2aa14..77b7d0baf 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -9674,11 +9674,13 @@ def create_trees(config_root=None, target_root=None, trees=None): backupenv_whitelist = settings._environ_whitelist backupenv = settings.configdict["backupenv"] + env_d = settings.configdict["env.d"] for k, v in os.environ.iteritems(): if k in backupenv_whitelist: continue - if v == backupenv.get(k): - del backupenv[k] + if k in env_d or \ + v == backupenv.get(k): + backupenv.pop(k, None) settings.regenerate() settings.lock() settings.validate() |