Move the "commit" mode manifest generation earlier in order

to avoid digest verification issues when FEATURES="strict"
is enabled. (trunk r7994:7996)

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

diff --git a/bin/repoman b/bin/repoman
index 42e4cd0b2c41b3620f530e72464542e5202ac8d9..3f024b479eeacb1403dfc6360ee934f57dbfedd0 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -876,12 +876,16 @@ 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)
 
        checkdirlist=os.listdir(checkdir)
        ebuildlist=[]
@@ -985,13 +989,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")