diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-09-25 22:08:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-25 22:08:21 +0000 |
| commit | a449f4e1101c676cfcfe66f735039d5e5e737e1c (patch) | |
| tree | 4ed5fd671e88cc0c1eca2b86b4ce7d913523238d | |
| parent | Fix a broken call to new_protect_filename for bug #147010. This patch is fro... (diff) | |
| download | portage-multirepo-a449f4e1101c676cfcfe66f735039d5e5e737e1c.tar.gz portage-multirepo-a449f4e1101c676cfcfe66f735039d5e5e737e1c.tar.bz2 portage-multirepo-a449f4e1101c676cfcfe66f735039d5e5e737e1c.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 (bug #147428) which is in trunk r4441.
svn path=/main/branches/2.1.1/; revision=4536
| -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 b59414ab..6739e91f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1590,7 +1590,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"): |