Permalink
Browse files

Fix an issue where emerge will abort when merge starts if we have a f…

…ile in our Manifest that does not exist on disk, even with thin-manifest enabled.
  • Loading branch information...
danielrobbins committed Oct 29, 2011
1 parent 5979052 commit 10e12874675564c431635e076c9cd3bbcd4dcedd
Showing with 1 addition and 1 deletion.
  1. +1 −1 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")

0 comments on commit 10e1287

Please sign in to comment.