summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-14 21:39:35 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-14 21:39:35 +0000
commit64d1c57a97f56df9a4e96f8a0a4efa98bf7de010 (patch)
treed0ce01c50f749435a891f2061dabdb0352c3c780
parent545e96ac48d6ac0927a4c462d77135ef32f142d8 (diff)
downloadportage-64d1c57a97f56df9a4e96f8a0a4efa98bf7de010.tar.gz
portage-64d1c57a97f56df9a4e96f8a0a4efa98bf7de010.tar.bz2
portage-64d1c57a97f56df9a4e96f8a0a4efa98bf7de010.zip
Catch fetch_check FileNotFound exceptions for bug #129962.
svn path=/main/trunk/; revision=3148
-rw-r--r--pym/portage.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 815f3820d..f53436ba0 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4820,7 +4820,12 @@ class portdbapi(dbapi):
ok = False
reason = "digest missing"
else:
- ok,reason = portage_checksum.verify_all(self.mysettings["DISTDIR"]+"/"+x, mysums[x])
+ try:
+ ok, reason = portage_checksum.verify_all(
+ os.path.join(self.mysettings["DISTDIR"], x), mysums[x])
+ except portage_exception.FileNotFound, e:
+ ok = False
+ reason = "File Not Found: '%s'" % str(e)
if not ok:
failures[x] = reason
if failures: