From 1f0298dd1b1a939cb215e7b474178b217f8347f4 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 24 Jan 2012 11:54:54 +1100 Subject: python: Change except: statement to except Exception: This way we only catch true exceptions and keyboard interrupts are not caught here. Autobuild-User: Amitay Isaacs Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104 --- source4/scripting/bin/upgradeprovision | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/scripting/bin/upgradeprovision') diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 738d6be891..aec0774a9d 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -1488,14 +1488,14 @@ def copyxattrs(dir, refdir): samba.xattr_native.wrap_setxattr(tgt, xattr.XATTR_NTACL_NAME, attribute) - except: + except Exception: noxattr = 1 attribute = samba.xattr_native.wrap_getxattr(ref, "system.posix_acl_access") samba.xattr_native.wrap_setxattr(tgt, "system.posix_acl_access", attribute) - except: + except Exception: continue for name in dirs: subdir=root[len(dir):] @@ -1511,7 +1511,7 @@ def copyxattrs(dir, refdir): samba.xattr_native.wrap_setxattr(tgt, xattr.XATTR_NTACL_NAME, attribute) - except: + except Exception: noxattr = 1 attribute = samba.xattr_native.wrap_getxattr(ref, "system.posix_acl_access") @@ -1519,7 +1519,7 @@ def copyxattrs(dir, refdir): "system.posix_acl_access", attribute) - except: + except Exception: continue -- cgit