From a6322d079b1d2e2cb72da1271171b35a173f3d22 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sun, 20 Nov 2005 13:14:37 +0100 Subject: merge-recursive: Replace 'except:' Plain except:s are evil as they will catch all kinds of exceptions including NameError and AttrubiteError. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 37258ad774..0129233550 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -245,7 +245,7 @@ def updateFileExt(sha, mode, path, updateCache, updateWd): try: createDir = not stat.S_ISDIR(os.lstat(p).st_mode) - except: + except OSError: createDir = True if createDir: @@ -295,7 +295,7 @@ def removeFile(clean, path): raise try: os.removedirs(os.path.dirname(path)) - except: + except OSError: pass def uniquePath(path, branch): -- cgit v1.2.1