From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 7 Oct 2007 21:25:02 +0000 (-0000)
Subject: Move the "commit" mode manifest generation earlier in order
X-Git-Tag: v2.2_pre1~688
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=deb26ccecb83192c15ea1797d65467f86475e7a0;p=portage.git

Move the "commit" mode manifest generation earlier in order
to avoid digest verification issues when FEATURES="strict"
is enabled.

svn path=/main/trunk/; revision=7995
---

diff --git a/bin/repoman b/bin/repoman
index d3b0b598d..76cc8ac51 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -829,12 +829,23 @@ for x in scanlist:
 	catdir,pkgdir=x.split("/")
 	checkdir=repodir+"/"+x
 
-	if mymode == "manifest":
+	if mymode == "manifest" or \
+		mymode in ("commit", "fix") and "--pretend" not in myoptions:
 		repoman_settings["O"] = checkdir
 		if not portage.digestgen([], repoman_settings, myportdb=portdb):
 			print "Unable to generate manifest."
 			dofail = 1
-		continue
+		if mymode == "manifest":
+			continue
+		elif dofail:
+			sys.exit(1)
+
+	if mymode in ("fix", "commit") and \
+		"--pretend" not in myoptions:
+		repoman_settings["O"] = checkdir
+		if not portage.digestgen([], repoman_settings, myportdb=portdb):
+			print "Unable to generate manifest."
+			sys.exit(1)
 
 	checkdirlist=os.listdir(checkdir)
 	ebuildlist=[]
@@ -938,13 +949,6 @@ for x in scanlist:
 				fails["CVS/Entries.IO_error"].append(checkdir+"/files/CVS/Entries")
 			continue
 
-	if mymode in ("fix", "commit") and \
-		"--pretend" not in myoptions:
-		repoman_settings["O"] = checkdir
-		if not portage.digestgen([], repoman_settings, myportdb=portdb):
-			print "Unable to generate manifest."
-			sys.exit(1)
-
 	mf = Manifest(checkdir, repoman_settings["DISTDIR"])
 	mydigests=mf.getTypeDigests("DIST")