diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-13 20:42:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-13 20:42:53 +0000 |
| commit | a2a86b6796097c809842556d44447973fd9c27df (patch) | |
| tree | 34756206c5d5ef011833b18418e6dee575b45492 /pym | |
| parent | d66e1f0513ae9cb8b4fcdb65bfed1ca210aa5aa7 (diff) | |
| download | portage-a2a86b6796097c809842556d44447973fd9c27df.tar.gz portage-a2a86b6796097c809842556d44447973fd9c27df.tar.bz2 portage-a2a86b6796097c809842556d44447973fd9c27df.zip | |
For correct LINGUAS handling, don't export empty USE_EXPAND variables unless the user config exports them as empty. Thanks to Harald van Dijk <truedfx@gentoo.org> for this patch from bug #147428.
svn path=/main/trunk/; revision=4441
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index af2ddb8ba..821edb81f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1609,7 +1609,11 @@ class config: # like LINGUAS. var_split = [ x for x in var_split if x in expand_flags ] var_split.extend(expand_flags.difference(var_split)) - self[var] = " ".join(var_split) + if var_split or var in self: + # Don't export empty USE_EXPAND vars unless the user config + # exports them as empty. This is required for vars such as + # LINGUAS, where unset and empty have different meanings. + self[var] = " ".join(var_split) # Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch. if self.configdict["defaults"].has_key("ARCH"): |