diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-13 18:31:28 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-13 18:31:28 -0700 |
| commit | dda534456c78a4927ad5c92352d9a5b9a7071923 (patch) | |
| tree | 8119e84806f0fe6bccb5ed50bc3131ab7a84a0ae | |
| parent | 224cb2be2a11270941742a8b08390767b0056d6c (diff) | |
| download | portage-dda534456c78a4927ad5c92352d9a5b9a7071923.tar.gz portage-dda534456c78a4927ad5c92352d9a5b9a7071923.tar.bz2 portage-dda534456c78a4927ad5c92352d9a5b9a7071923.zip | |
debuild: pass manifest to digestcheck()v2.2.0_alpha45
This allows us to avoid parsing the Manifest twice.
| -rw-r--r-- | pym/portage/package/ebuild/digestcheck.py | 5 | ||||
| -rw-r--r-- | 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": |