From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 May 2008 19:13:08 +0000 (-0000)
Subject: Bug #221053 - Save the resume list before verifying the ebuild Manifests
X-Git-Tag: v2.1.5~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f8664ad3e8073f6b1a715685755f7727216c901;p=portage.git

Bug #221053 - Save the resume list before verifying the ebuild Manifests
since it might be possible for the user to use --resume --skipfirst get
past a non-essential package with a broken digest. (trunk r10275)

svn path=/main/branches/2.1.2/; revision=10276
---

diff --git a/bin/emerge b/bin/emerge
index e97af9c92..c4cdd7d38 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -5767,6 +5767,13 @@ class MergeTask(object):
 			print colorize("GOOD", "*** Resuming merge...")
 			emergelog(xterm_titles, " *** Resuming merge...")
 
+		# Do this before verifying the ebuild Manifests since it might
+		# be possible for the user to use --resume --skipfirst get past
+		# a non-essential package with a broken digest.
+		mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \
+			if isinstance(x, Package) and x.operation == "merge"]
+		mtimedb.commit()
+
 		# Verify all the manifests now so that the user is notified of failure
 		# as soon as possible.
 		if "--fetchonly" not in self.myopts and \
@@ -5800,10 +5807,6 @@ class MergeTask(object):
 		args_set = InternalPackageSet(favorites)
 		world_set = root_config.sets["world"]
 
-		mtimedb["resume"]["mergelist"] = [list(x) for x in mylist \
-			if isinstance(x, Package) and x.operation == "merge"]
-		mtimedb.commit()
-
 		mymergelist = mylist
 		myfeat = self.settings.features[:]
 		bad_resume_opts = set(["--ask", "--changelog", "--skipfirst",