| 1 |
commit: f06f1d8e2174527cc7f4b5491f0f84d41f368d62 |
| 2 |
Author: Daniel Robbins <drobbins <AT> funtoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 04:06:00 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 04:21:38 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f06f1d8e |
| 7 |
|
| 8 |
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. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/digestcheck.py | 2 +- |
| 12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py |
| 15 |
index 3b22b1d..c8d168e 100644 |
| 16 |
--- a/pym/portage/package/ebuild/digestcheck.py |
| 17 |
+++ b/pym/portage/package/ebuild/digestcheck.py |
| 18 |
@@ -35,7 +35,7 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): |
| 19 |
eout = EOutput() |
| 20 |
eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" |
| 21 |
try: |
| 22 |
- if strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: |
| 23 |
+ if not mf.thin and strict and "PORTAGE_PARALLEL_FETCHONLY" not in mysettings: |
| 24 |
if mf.fhashdict.get("EBUILD"): |
| 25 |
eout.ebegin(_("checking ebuild checksums ;-)")) |
| 26 |
mf.checkTypeHashes("EBUILD") |
Archives