From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QhAmL-0005ME-U1 for garchives@archives.gentoo.org; Thu, 14 Jul 2011 01:31:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B632821C181; Thu, 14 Jul 2011 01:31:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 84BE121C181 for ; Thu, 14 Jul 2011 01:31:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 158F81B4084 for ; Thu, 14 Jul 2011 01:31:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7C0EC8003D for ; Thu, 14 Jul 2011 01:31:41 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/digestcheck.py pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dda534456c78a4927ad5c92352d9a5b9a7071923 Date: Thu, 14 Jul 2011 01:31:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e9c713f6416b2707c915245f0ffd95cf commit: dda534456c78a4927ad5c92352d9a5b9a7071923 Author: Zac Medico gentoo org> AuthorDate: Thu Jul 14 01:31:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 14 01:31:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddda53445 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/pack= age/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.manifest import Manifest from portage.output import EOutput from portage.util import writemsg =20 -def digestcheck(myfiles, mysettings, strict=3DFalse, justmanifest=3DNone= ): +def digestcheck(myfiles, mysettings, strict=3DFalse, justmanifest=3DNone= , mf=3DNone): """ Verifies checksums. Assumes all files have been downloaded. @rtype: int @@ -40,7 +40,8 @@ def digestcheck(myfiles, mysettings, strict=3DFalse, ju= stmanifest=3DNone): return 0 else: return 1 - mf =3D Manifest(pkgdir, mysettings["DISTDIR"]) + if mf is None: + mf =3D Manifest(pkgdir, mysettings["DISTDIR"]) manifest_empty =3D 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 @@ def doebuild(myebuild, mydo, myroot, mysettings, debu= g=3D0, listonly=3D0, =20 # See above comment about fetching only when needed if tree =3D=3D 'porttree' and \ - not digestcheck(checkme, mysettings, "strict" in features): + not digestcheck(checkme, mysettings, "strict" in features, mf=3Dmf): return 1 =20 if mydo =3D=3D "fetch":