From f182ca4ca79d405c8af6cbd148b77ced96416abe Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Mon, 26 Apr 2010 13:35:30 +0000 Subject: Only merge with perm.local if it exists --- src/msec/msecperms.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/msec/msecperms.py b/src/msec/msecperms.py index 4e1c42b..f187302 100755 --- a/src/msec/msecperms.py +++ b/src/msec/msecperms.py @@ -169,10 +169,11 @@ if __name__ == "__main__": newlevel.save() sys.exit(0) - # merge with a legacy perm.local - permlocal = config.PermConfig(log, config="%s/etc/security/msec/perm.local" % root) - permlocal.load() - permconf.merge(permlocal, overwrite=True) + # merge with a legacy perm.local if exists + if os.access("%s/etc/security/msec/perm.local" % root, os.R_OK): + permlocal = config.PermConfig(log, config="%s/etc/security/msec/perm.local" % root) + permlocal.load() + permconf.merge(permlocal, overwrite=True) # load the main permission class perm = PERMS(log, root=root) -- cgit v1.2.1