From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Apr 2006 21:39:35 +0000 (-0000)
Subject: Catch fetch_check FileNotFound exceptions for bug #129962.
X-Git-Tag: v2.1_pre9~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64d1c57a97f56df9a4e96f8a0a4efa98bf7de010;p=portage.git

Catch fetch_check FileNotFound exceptions for bug #129962.

svn path=/main/trunk/; revision=3148
---

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: