Protect USE_EXPAND flags from -* in order to preserve previous behavior which has...

svn path=/main/trunk/; revision=4114

diff --git a/pym/portage.py b/pym/portage.py
index effe789d67eef99bd919192d239a54dd1d433d58..a348cdd4f9ae4bcc4547e3fff4d4107f762bad3c 100644 (file)
--- 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]=="+":