When performing expansion of USE_EXPAND variables, display warnings about invalid...

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

diff --git a/pym/portage.py b/pym/portage.py
index 2c5841ef6d99dd2b537fad31632f29e94cf12c32..eac43287d771b2730de0e9e8bc071898efc2aadb 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1509,12 +1509,19 @@ class config:
                for var in use_expand:
                        var_lower = var.lower()
                        for x in self.get(var, "").split():
+                               # Any incremental USE_EXPAND variables have already been
+                               # processed, so leading +/- operators are invalid here.
                                if x[0] == "+":
+                                       writemsg(colorize("BAD", "Invalid '+' operator in " + \
+                                               "non-incremental variable '%s': '%s'\n" % (var, x)),
+                                               noiselevel=-1)
                                        x = x[1:]
                                if x[0] == "-":
-                                       mystr = "-" + var_lower + "_" + x[1:]
-                               else:
-                                       mystr = var_lower + "_" + x
+                                       writemsg(colorize("BAD", "Invalid '-' operator in " + \
+                                               "non-incremental variable '%s': '%s'\n" % (var, x)),
+                                               noiselevel=-1)
+                                       continue
+                               mystr = var_lower + "_" + x
                                if mystr not in use_expand_protected:
                                        use_expand_protected.append(mystr)