From f06f1d8e2174527cc7f4b5491f0f84d41f368d62 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Sat, 29 Oct 2011 04:06:00 +0000 Subject: [PATCH] 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 enabled. --- pym/portage/package/ebuild/digestcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py index 3b22b1df6..c8d168e0f 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -35,7 +35,7 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): eout = EOutput() eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" try: - if strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: + if not mf.thin and strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: if mf.fhashdict.get("EBUILD"): eout.ebegin(_("checking ebuild checksums ;-)")) mf.checkTypeHashes("EBUILD") -- 2.26.2