diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-02-17 19:08:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-17 19:08:04 +0000 |
| commit | a3e1111b11dcf0fd64ebb3bc0edc53ef724ec3a3 (patch) | |
| tree | 0c07c7addd94c746018a51b749db50c597f06320 | |
| parent | cef5abd5cf040d5fa0a1c23520570c94a87bcf18 (diff) | |
| download | portage-a3e1111b11dcf0fd64ebb3bc0edc53ef724ec3a3.tar.gz portage-a3e1111b11dcf0fd64ebb3bc0edc53ef724ec3a3.tar.bz2 portage-a3e1111b11dcf0fd64ebb3bc0edc53ef724ec3a3.zip | |
Bring back myline variable inside do_upgrade because it is needed (regression from rev 2726).
svn path=/main/trunk/; revision=2727
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index ad5c5f359..a242d7f13 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6800,9 +6800,12 @@ def do_upgrade(mykey): continue worldlist=grabfile("/"+WORLD_FILE) - myupd = map(lambda x: x.split(), grabfile(mykey)) + myupd = [] + mylines = grabfile(mykey) db["/"]["bintree"]=binarytree("/",settings["PKGDIR"],virts) - for mysplit in myupd: + for myline in mylines: + mysplit = myline.split() + myupd.append(mysplit) if not len(mysplit): continue if mysplit[0]!="move" and mysplit[0]!="slotmove": @@ -6826,7 +6829,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(mysplit) # myupd is used by fixpackages later + myupd.pop() # myupd is used by fixpackages later continue #update world entries: for x in range(0,len(worldlist)): |