summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-05-06 22:12:44 +0000
committerZac Medico <zmedico@gentoo.org>2009-05-06 22:12:44 +0000
commit23ddb4a0df8b616bee680ad61af7966b284020bb (patch)
treeffcaddb42fbf880a077cef43626cdd5f2f3d5f29
parent91bb938ce2990094decda1956b1cc81b304a3f70 (diff)
downloadportage-23ddb4a0df8b616bee680ad61af7966b284020bb.tar.gz
portage-23ddb4a0df8b616bee680ad61af7966b284020bb.tar.bz2
portage-23ddb4a0df8b616bee680ad61af7966b284020bb.zip
Fix digestcheck() to handle missing distfiles digests correctly. Thanks to
Petteri Räty <betelgeuse@g.o> for reporting. svn path=/main/trunk/; revision=13618
-rw-r--r--pym/portage/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 93031b796..6854eea99 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4822,7 +4822,10 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0):
eout.eend(0)
for f in myfiles:
eout.ebegin("checking %s ;-)" % f)
- mf.checkFileHashes(mf.findFile(f), f)
+ ftype = mf.findFile(f)
+ if ftype is None:
+ raise KeyError(f)
+ mf.checkFileHashes(ftype, f)
eout.eend(0)
except KeyError, e:
eout.eend(1)