summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-13 02:22:22 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-13 02:22:22 +0000
commit795ea82260449753e3c4be0c603fe7eed0144385 (patch)
treea477e3cbc7d7470955a1d54072a9f96ac8b1f319
parent80637e497ee04ad79885af775e6d7dc96b346b63 (diff)
downloadportage-795ea82260449753e3c4be0c603fe7eed0144385.tar.gz
portage-795ea82260449753e3c4be0c603fe7eed0144385.tar.bz2
portage-795ea82260449753e3c4be0c603fe7eed0144385.zip
Don't swallow unknown exceptions from lstat() during the merge phase.
svn path=/main/trunk/; revision=3839
-rw-r--r--pym/portage.py9
1 files changed, 5 insertions, 4 deletions
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