diff options
author | Daniel Robbins <drobbins@funtoo.org> | 2011-10-29 04:06:00 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-10-28 21:21:38 -0700 |
commit | f06f1d8e2174527cc7f4b5491f0f84d41f368d62 (patch) | |
tree | ce3cde22cc0cc2b12112c0f3d0590566bd032fef | |
parent | 3cfb2bc711d820fcef376aee170de560d8195819 (diff) | |
download | portage-f06f1d8e2174527cc7f4b5491f0f84d41f368d62.tar.gz portage-f06f1d8e2174527cc7f4b5491f0f84d41f368d62.tar.bz2 portage-f06f1d8e2174527cc7f4b5491f0f84d41f368d62.zip |
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.
-rw-r--r-- | 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/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") |