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 1RK0Qg-0005KL-60 for garchives@archives.gentoo.org; Sat, 29 Oct 2011 04:22:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3B9A21C021; Sat, 29 Oct 2011 04:21:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6C86C21C021 for ; Sat, 29 Oct 2011 04:21:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2C521B401F for ; Sat, 29 Oct 2011 04:21:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 582E280042 for ; Sat, 29 Oct 2011 04:21:48 +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 X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f06f1d8e2174527cc7f4b5491f0f84d41f368d62 Date: Sat, 29 Oct 2011 04:21:48 +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: 6ade8f8a106ba6d8fb0c972c869c6a06 commit: f06f1d8e2174527cc7f4b5491f0f84d41f368d62 Author: Daniel Robbins funtoo org> AuthorDate: Sat Oct 29 04:06:00 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 29 04:21:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df06f1d8e Fix an issue where emerge will abort when merge starts if we have a file = in our Manifest that does not exist on disk, even with thin-manifest enab= led. --- pym/portage/package/ebuild/digestcheck.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/pack= age/ebuild/digestcheck.py index 3b22b1d..c8d168e 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -35,7 +35,7 @@ def digestcheck(myfiles, mysettings, strict=3DFalse, ju= stmanifest=3DNone, mf=3DNone): eout =3D EOutput() eout.quiet =3D mysettings.get("PORTAGE_QUIET", None) =3D=3D "1" try: - if strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: + if not mf.thin and strict and "PORTAGE_PARALLEL_FETCHONLY" not in myse= ttings: if mf.fhashdict.get("EBUILD"): eout.ebegin(_("checking ebuild checksums ;-)")) mf.checkTypeHashes("EBUILD")