Fix up missing mymergelist variable from the previous commit. (trunk r6445:6446)

svn path=/main/branches/2.1.2/; revision=6447

diff --git a/bin/emerge b/bin/emerge
index c04649dd864c5d3e5aadb237c87cee8bc47cd0d3..0e40a955da857a0f6e51fc88f95dacd815b3bc1f 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2893,12 +2893,13 @@ class MergeTask(object):
                        # We're resuming.
                        print colorize("GOOD", "*** Resuming merge...")
                        emergelog(xterm_titles, " *** Resuming merge...")
-                       mymergelist = mtimedb["resume"]["mergelist"][:]
-                       if "--skipfirst" in self.myopts and mymergelist:
+                       mylist = mtimedb["resume"]["mergelist"][:]
+                       if "--skipfirst" in self.myopts and mylist:
                                del mtimedb["resume"]["mergelist"][0]
-                               del mymergelist[0]
+                               del mylist[0]
                                mtimedb.commit()
-                       validate_merge_list(self.trees, mymergelist)
+                       validate_merge_list(self.trees, mylist)
+                       mymergelist = mylist
 
                # Verify all the manifests now so that the user is notified of failure
                # as soon as possible.
@@ -2913,7 +2914,7 @@ class MergeTask(object):
                                quiet_config.backup_changes("PORTAGE_QUIET")
                                quiet_settings[myroot] = quiet_config
                                del quiet_config
-                       for x in mymergelist:
+                       for x in mylist:
                                if x[0] != "ebuild" or x[-1] == "nomerge":
                                        continue
                                if not shown_verifying_msg: