remove invalid package moves from myupd so that fixpackages doesn't process them

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

diff --git a/pym/portage.py b/pym/portage.py
index c41878ff7f6f783d361b08edadcf624977479f98..d006487d96117c0613f2a340fc63d430636cd334 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6825,6 +6825,7 @@ def do_upgrade(mykey):
                                db["/"]["bintree"].move_ent(mysplit)
                        except portage_exception.InvalidPackageName, e:
                                writemsg("\nERROR: Malformed update entry '%s'\n" % myline)
+                               myupd.remove(myline) # myupd is used by fixpackages later
                                continue
                        #update world entries:
                        for x in range(0,len(worldlist)):