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 1QhAF2-0008N8-3n for garchives@archives.gentoo.org; Thu, 14 Jul 2011 00:57:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1281F21C067; Thu, 14 Jul 2011 00:57:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D416121C067 for ; Thu, 14 Jul 2011 00:57:15 +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 649C32AC0AE for ; Thu, 14 Jul 2011 00:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C02268003D for ; Thu, 14 Jul 2011 00:57:14 +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/doebuild.py pym/portage/package/ebuild/fetch.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d85b7e5ceb8a1585b8b8a8e4383dc6de5450e616 Date: Thu, 14 Jul 2011 00:57:14 +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: 085467c1d101d3bdd1d91799e8056670 commit: d85b7e5ceb8a1585b8b8a8e4383dc6de5450e616 Author: Zac Medico gentoo org> AuthorDate: Thu Jul 14 00:56:57 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 14 00:56:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd85b7e5c debuild: pass dist digests to fetch() This allows us to avoid parsing the Manifest twice. --- pym/portage/package/ebuild/doebuild.py | 7 ++++++- pym/portage/package/ebuild/fetch.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 1849af9..8e7515c 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -478,6 +478,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debu= g=3D0, listonly=3D0, noiselevel=3D-1) return 1 =20 + mf =3D None if "strict" in features and \ "digest" not in features and \ tree =3D=3D "porttree" and \ @@ -765,8 +766,12 @@ def doebuild(myebuild, mydo, myroot, mysettings, deb= ug=3D0, listonly=3D0, else: fetchme =3D alist =20 + dist_digests =3D None + if mf is not None: + dist_digests =3D mf.getTypeDigests("DIST") if not fetch(fetchme, mysettings, listonly=3Dlistonly, - fetchonly=3Dfetchonly, allow_missing_digests=3DTrue): + fetchonly=3Dfetchonly, allow_missing_digests=3DTrue, + digests=3Ddist_digests): spawn_nofetch(mydbapi, myebuild, settings=3Dmysettings) if listonly: # The convention for listonly mode is to report diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/eb= uild/fetch.py index 46d77cf..2ae1fe8 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -358,7 +358,7 @@ def fetch(myuris, mysettings, listonly=3D0, fetchonly= =3D0, if digests is None and not (pkgdir is None or skip_manifest): mydigests =3D Manifest( pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST") - elif digests is None: + elif digests is None or skip_manifest: # no digests because fetch was not called for a specific package mydigests =3D {} else: