Bring back myline variable inside do_upgrade because it is needed (regression from...

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

diff --git a/pym/portage.py b/pym/portage.py
index ad5c5f3590ed2f8833d3dfeef23b7630b4c394f9..a242d7f13873584016cd24c75acd337ef1c51823 100644 (file)
--- 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)):