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 703c905c6b6e68c97a3571ce1f837e468c5de1ff..c36b9ef6e59f814da81c16cffc2e32e56e0582f2 100644 (file)
--- 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