diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-01-24 11:54:54 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2012-01-24 03:32:40 +0100 |
| commit | 1f0298dd1b1a939cb215e7b474178b217f8347f4 (patch) | |
| tree | 6ca7a3908b797f6e35b91c6156fb9d9a5bed4697 /source4/scripting/bin/upgradeprovision | |
| parent | be292021f47eeaa1364bedb2dc9232b60c404fce (diff) | |
| download | samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.gz samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.bz2 samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.zip | |
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 <amitay@samba.org>
Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104
Diffstat (limited to 'source4/scripting/bin/upgradeprovision')
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 8 |
1 files changed, 4 insertions, 4 deletions
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 |