[patch] validate the resume merge list before attempting to verify the ebuild manifests

resume.patch (text/plain), 1.47 KB, created by Zac Medico on 2007-04-28 02:01:40 UTC

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 6444)
+++ bin/emerge	(revision 6447)
@@ -2889,6 +2889,18 @@
 						show_blocker_docs_link()
 					return 1
 
+		if "--resume" in self.myopts:
+			# We're resuming.
+			print colorize("GOOD", "*** Resuming merge...")
+			emergelog(xterm_titles, " *** Resuming merge...")
+			mylist = mtimedb["resume"]["mergelist"][:]
+			if "--skipfirst" in self.myopts and mylist:
+				del mtimedb["resume"]["mergelist"][0]
+				del mylist[0]
+				mtimedb.commit()
+			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.
 		if "--fetchonly" not in self.myopts and \
@@ -2919,17 +2931,7 @@
 
 		#buildsyspkg: I need mysysdict also on resume (moved from the else block)
 		mysysdict = genericdict(getlist(self.settings, "system"))
-		if "--resume" in self.myopts:
-			# We're resuming.
-			print colorize("GOOD", "*** Resuming merge...")
-			emergelog(xterm_titles, " *** Resuming merge...")
-			mymergelist=mtimedb["resume"]["mergelist"][:]
-			if "--skipfirst" in self.myopts and mymergelist:
-				del mtimedb["resume"]["mergelist"][0]
-				del mymergelist[0]
-				mtimedb.commit()
-			validate_merge_list(self.trees, mymergelist)
-		else:
+		if "--resume" not in self.myopts:
 			myfavs = portage.grabfile(
 				os.path.join(self.target_root, portage.WORLD_FILE))
 			myfavdict=genericdict(myfavs)