diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-12 06:14:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-12 06:14:04 +0000 |
| commit | 37cef1df376d0ce279f769b6c9755011c73156cf (patch) | |
| tree | 913975e47ad48320b7952ed5fbd0e58ffed27398 /bin | |
| parent | 52a103999047f6fdc24028cff976123bbcacb516 (diff) | |
| download | portage-37cef1df376d0ce279f769b6c9755011c73156cf.tar.gz portage-37cef1df376d0ce279f769b6c9755011c73156cf.tar.bz2 portage-37cef1df376d0ce279f769b6c9755011c73156cf.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/bin/repoman b/bin/repoman index 42e4cd0b2..3f024b479 100755 --- 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") |