summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-07 21:25:02 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-07 21:25:02 +0000
commitdeb26ccecb83192c15ea1797d65467f86475e7a0 (patch)
treeb00b98813cc672f9c8ae2b3cd8643bafcb8cfb05
parent989d324ea91f6b225336ea01faf2866669609785 (diff)
downloadportage-deb26ccecb83192c15ea1797d65467f86475e7a0.tar.gz
portage-deb26ccecb83192c15ea1797d65467f86475e7a0.tar.bz2
portage-deb26ccecb83192c15ea1797d65467f86475e7a0.zip
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
-rwxr-xr-xbin/repoman22
1 files changed, 13 insertions, 9 deletions
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")