From 7f9fe4299353861393bfd4d4aad6cbc1569d408c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 3 Aug 2006 09:49:17 +0000 Subject: Protect USE_EXPAND flags from -* in order to preserve previous behavior which has changed due to the fix for bug #142125. svn path=/main/trunk/; revision=4114 --- pym/portage.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index effe789d6..a348cdd4f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1450,6 +1450,7 @@ class config: else: self.configdict["auto"]["USE"]="" use_expand = self.get("USE_EXPAND", "").split() + use_expand_protected = set() else: mydbs=self.configlist[:-1] @@ -1471,6 +1472,7 @@ class config: mystr = "-" + var_lower + "_" + x[1:] else: mystr = var_lower + "_" + x + use_expand_protected.add(mystr) if mystr not in mysplit: mysplit.append(mystr) @@ -1478,7 +1480,10 @@ class config: if x=="-*": # "-*" is a special "minus" var that means "unset all settings". # so USE="-* gnome" will have *just* gnome enabled. - myflags=[] + if mykey == "USE": + myflags = list(use_expand_protected) + else: + myflags = [] continue if x[0]=="+": -- cgit v1.2.3-1-g7c22