debuild: pass manifest to digestcheck()
This allows us to avoid parsing the Manifest twice.
diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py
index 21cadc3..1e34b14 100644
--- a/pym/portage/package/ebuild/digestcheck.py
+++ b/pym/portage/package/ebuild/digestcheck.py
@@ -12,7 +12,7 @@
from portage.output import EOutput
from portage.util import writemsg
-def digestcheck(myfiles, mysettings, strict=False, justmanifest=None):
+def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None):
"""
Verifies checksums. Assumes all files have been downloaded.
@rtype: int
@@ -40,7 +40,8 @@
return 0
else:
return 1
- mf = Manifest(pkgdir, mysettings["DISTDIR"])
+ if mf is None:
+ mf = Manifest(pkgdir, mysettings["DISTDIR"])
manifest_empty = True
for d in mf.fhashdict.values():
if d:
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index e63c0e5..fb29b00 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -816,7 +816,7 @@
# See above comment about fetching only when needed
if tree == 'porttree' and \
- not digestcheck(checkme, mysettings, "strict" in features):
+ not digestcheck(checkme, mysettings, "strict" in features, mf=mf):
return 1
if mydo == "fetch":
