From dda534456c78a4927ad5c92352d9a5b9a7071923 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 13 Jul 2011 18:31:28 -0700 Subject: [PATCH] debuild: pass manifest to digestcheck() This allows us to avoid parsing the Manifest twice. --- pym/portage/package/ebuild/digestcheck.py | 5 +++-- pym/portage/package/ebuild/doebuild.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py index 21cadc3f5..1e34b1496 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -12,7 +12,7 @@ from portage.manifest import Manifest 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 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None): 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 e63c0e5a3..fb29b0062 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -816,7 +816,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, # 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": -- 2.26.2