From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Nov 2008 07:22:49 +0000 (-0000)
Subject: Remove unnecessary handler for plain "Exception" from lstat() call in
X-Git-Tag: v2.2_rc13~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c548c68cbd575ba9359ba080b0beb074a0e7d42;p=portage.git

Remove unnecessary handler for plain "Exception" from lstat() call in
dblink.mergeme().

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c24039179..fe45e3b4e 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3481,16 +3481,6 @@ class dblink(object):
 				writemsg(red("!!!        File:  ")+str(mysrc)+"\n", noiselevel=-1)
 				writemsg(red("!!!        Error: ")+str(e)+"\n", noiselevel=-1)
 				return 1
-			except Exception, e:
-				writemsg("\n")
-				writemsg(red("!!! ERROR: An unknown error has occurred during the merge process.\n"))
-				writemsg(red("!!!        A stat call returned the following error for the following file:"))
-				writemsg(    "!!!        Please ensure that your filesystem is intact, otherwise report\n")
-				writemsg(    "!!!        this as a portage bug at bugs.gentoo.org. Append 'emerge info'.\n")
-				writemsg(    "!!!        File:  "+str(mysrc)+"\n", noiselevel=-1)
-				writemsg(    "!!!        Error: "+str(e)+"\n", noiselevel=-1)
-				return 1
-
 
 			mymode = mystat[stat.ST_MODE]
 			# handy variables; mydest is the target object on the live filesystems;