From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 17 Feb 2006 04:41:39 +0000 (-0000)
Subject: remove invalid package moves from myupd so that fixpackages doesn't process them
X-Git-Tag: v2.1_pre5_2760~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c65e62ab58f8c461ac8fa8466048aeb542e02d63;p=portage.git

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 c41878ff7..d006487d9 100644
--- 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)):