diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-02-17 23:25:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-17 23:25:04 +0000 |
| commit | 3eec9ae38927c16b0c358ec55d61f1f81f05fbf9 (patch) | |
| tree | ce42872c74ef86d5cfc6303dd9db16c291abba77 | |
| parent | a3e1111b11dcf0fd64ebb3bc0edc53ef724ec3a3 (diff) | |
| download | portage-3eec9ae38927c16b0c358ec55d61f1f81f05fbf9.tar.gz portage-3eec9ae38927c16b0c358ec55d61f1f81f05fbf9.tar.bz2 portage-3eec9ae38927c16b0c358ec55d61f1f81f05fbf9.zip | |
Filter out some more invalid updates before fixpackages gets them.
svn path=/main/trunk/; revision=2728
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index a242d7f13..bedb9318d 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6770,6 +6770,7 @@ features=settings["FEATURES"].split() do_upgrade_packagesmessage=0 def do_upgrade(mykey): + """Valid updates are returned as a list of split update commands.""" global do_upgrade_packagesmessage writemsg("\n\n") writemsg(green("Performing Global Updates: ")+bold(mykey)+"\n") @@ -6805,7 +6806,6 @@ def do_upgrade(mykey): db["/"]["bintree"]=binarytree("/",settings["PKGDIR"],virts) for myline in mylines: mysplit = myline.split() - myupd.append(mysplit) if not len(mysplit): continue if mysplit[0]!="move" and mysplit[0]!="slotmove": @@ -6829,7 +6829,6 @@ def do_upgrade(mykey): db["/"]["bintree"].move_ent(mysplit) except portage_exception.InvalidPackageName, e: writemsg("\nERROR: Malformed update entry '%s'\n" % myline) - myupd.pop() # myupd is used by fixpackages later continue #update world entries: for x in range(0,len(worldlist)): @@ -6855,6 +6854,9 @@ def do_upgrade(mykey): db["/"]["bintree"].move_slot_ent(mysplit,settings["PORTAGE_TMPDIR"]+"/tbz2") except portage_exception.InvalidAtom, e: writemsg("\nERROR: Malformed update entry '%s'\n" % myline) + + # The list of valid updates is filtered by continue statements above. + myupd.append(mysplit) for x in update_files: mydblink = dblink('','','/',settings) |