From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Jul 2006 02:22:22 +0000 (-0000)
Subject: Don't swallow unknown exceptions from lstat() during the merge phase.
X-Git-Tag: v2.1.1~240
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=795ea82260449753e3c4be0c603fe7eed0144385;p=portage.git

Don't swallow unknown exceptions from lstat() during the merge phase.

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

diff --git a/pym/portage.py b/pym/portage.py
index 703c905c6..c36b9ef6e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6484,10 +6484,11 @@ class dblink:
 			# handy variables; mydest is the target object on the live filesystems;
 			# mysrc is the source object in the temporary install dir
 			try:
-				mydmode=os.lstat(mydest)[stat.ST_MODE]
-			except SystemExit, e:
-				raise
-			except:
+				mydmode = os.lstat(mydest).st_mode
+			except OSError, e:
+				if e.errno != errno.ENOENT:
+					raise
+				del e
 				#dest file doesn't exist
 				mydmode=None