Prevent an InvalidData exception during global updates due to the new stricter catpkg...

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

diff --git a/pym/portage_update.py b/pym/portage_update.py
index f156c39bccc1996392960b0362e2b1ab8b282943..1a2a1d8841ed5c697f4fbaedb01f875aa1978561 100644 (file)
--- a/pym/portage_update.py
+++ b/pym/portage_update.py
@@ -188,7 +188,13 @@ def update_config_files(config_root, protect, protect_mask, update_iter):
                                        line = file_contents[x][mypos]
                                        if line[0] == "#" or not line.strip():
                                                continue
-                                       key = dep_getkey(line.split()[0])
+                                       myatom = line.split()[0]
+                                       if myatom.startswith("-"):
+                                               # package.mask supports incrementals
+                                               myatom = myatom[1:]
+                                       if not isvalidatom(myatom):
+                                               continue
+                                       key = dep_getkey(myatom)
                                        if key == old_value:
                                                file_contents[x][mypos] = \
                                                        line.replace(old_value, new_value)