From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 25 Sep 2006 22:08:21 +0000 (-0000)
Subject: For correct LINGUAS handling, don't export empty USE_EXPAND variables unless the... 
X-Git-Tag: v2.1.1-r1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a449f4e1101c676cfcfe66f735039d5e5e737e1c;p=portage.git

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
---

diff --git a/pym/portage.py b/pym/portage.py
index b59414ab0..6739e91fb 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"):