Fix an issue where emerge will abort when merge starts if we have a file in our Manif...
authorDaniel Robbins <drobbins@funtoo.org>
Sat, 29 Oct 2011 04:06:00 +0000 (04:06 +0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 29 Oct 2011 04:21:38 +0000 (21:21 -0700)
pym/portage/package/ebuild/digestcheck.py

index 3b22b1df6dbe4c2ab9996f91201093e345360310..c8d168e0f93c5c971daa82ab516aec0f6e7d0ce4 100644 (file)
@@ -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")