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 1QhAfw-0004Gs-2y for garchives@archives.gentoo.org; Thu, 14 Jul 2011 01:25:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22C0621C126; Thu, 14 Jul 2011 01:25:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EBC6921C126 for ; Thu, 14 Jul 2011 01:25:04 +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 837A31B408A for ; Thu, 14 Jul 2011 01:25:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A70398003D for ; Thu, 14 Jul 2011 01:25:03 +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: <224cb2be2a11270941742a8b08390767b0056d6c.zmedico@gentoo> 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 X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 224cb2be2a11270941742a8b08390767b0056d6c Date: Thu, 14 Jul 2011 01:25:03 +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: 48b48b22eeb6670ec8dc875090180aed commit: 224cb2be2a11270941742a8b08390767b0056d6c Author: Zac Medico gentoo org> AuthorDate: Thu Jul 14 01:24:49 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 14 01:24:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D224cb2be doebuild: discard cached manifest when necessary When we call digestgen(), it can regenerate our distfiles digests and we don't wan to cache stale values in this case. --- pym/portage/package/ebuild/doebuild.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 8e7515c..e63c0e5 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 + global _doebuild_manifest_cache mf =3D None if "strict" in features and \ "digest" not in features and \ @@ -485,7 +486,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debu= g=3D0, listonly=3D0, mydo not in ("digest", "manifest", "help") and \ not portage._doebuild_manifest_exempt_depend: # Always verify the ebuild checksums before executing it. - global _doebuild_manifest_cache, _doebuild_broken_ebuilds + global _doebuild_broken_ebuilds =20 if myebuild in _doebuild_broken_ebuilds: return 1 @@ -793,14 +794,20 @@ def doebuild(myebuild, mydo, myroot, mysettings, de= bug=3D0, listonly=3D0, =20 try: if mydo =3D=3D "manifest": + mf =3D None + _doebuild_manifest_cache =3D None return not digestgen(mysettings=3Dmysettings, myportdb=3Dmydbapi) elif mydo =3D=3D "digest": + mf =3D None + _doebuild_manifest_cache =3D None return not digestgen(mysettings=3Dmysettings, myportdb=3Dmydbapi) elif mydo !=3D 'fetch' and \ "digest" in mysettings.features: # Don't do this when called by emerge or when called just # for fetch (especially parallel-fetch) since it's not needed # and it can interfere with parallel tasks. + mf =3D None + _doebuild_manifest_cache =3D None digestgen(mysettings=3Dmysettings, myportdb=3Dmydbapi) except PermissionDenied as e: writemsg(_("!!! Permission Denied: %s\n") % (e,), noiselevel=3D-1)