diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-07 22:42:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-07 22:42:44 +0000 |
| commit | e2d1d49eff905e4ebb49e8d43955f52cac249cf6 (patch) | |
| tree | 7362e1c365f3b90c7cd903912340ed74db6fcc91 /bin/emerge | |
| parent | ac6f697904f15454e6708d95a80d7a0377ee8830 (diff) | |
| download | portage-e2d1d49eff905e4ebb49e8d43955f52cac249cf6.tar.gz portage-e2d1d49eff905e4ebb49e8d43955f52cac249cf6.tar.bz2 portage-e2d1d49eff905e4ebb49e8d43955f52cac249cf6.zip | |
Make load_emerge_config() filter out empty PORTAGE_CONFIGROOT and ROOT
values, and those containing only whitespace. (trunk r10594)
svn path=/main/branches/2.1.2/; revision=10595
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 199a7b618..f49873d7b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -8743,7 +8743,9 @@ def validate_ebuild_environment(trees): def load_emerge_config(trees=None): kwargs = {} for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")): - kwargs[k] = os.environ.get(envvar, None) + v = os.environ.get(envvar, None) + if v and v.strip(): + kwargs[k] = v trees = portage.create_trees(trees=trees, **kwargs) for root, root_trees in trees.iteritems(): |