For correct LINGUAS handling, don't export empty USE_EXPAND variables unless the...

svn path=/main/branches/2.1.1/; revision=4536

diff --git a/pym/portage.py b/pym/portage.py
index b59414ab0a2af3f8d79fc57d14886765fe8dd96c..6739e91fbcedfda875fca2766ae230b802e54cbc 100644 (file)
--- 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"):