[apparmor] [PATCH] utils: Use apparmor.fail for AppArmorException handling in aa-easyprof
Tyler Hicks
tyhicks at canonical.com
Tue Dec 15 23:42:20 UTC 2015
Don't catch AppArmorExceptions in aa-easyprof any longer and rely on
apparmor.fail to print the exception to stderr.
Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
utils/aa-easyprof | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/utils/aa-easyprof b/utils/aa-easyprof
index 93861ae..de7236c 100755
--- a/utils/aa-easyprof
+++ b/utils/aa-easyprof
@@ -61,12 +61,7 @@ if __name__ == "__main__":
for (binary, options) in profiles:
if len(profiles) > 1:
count += 1
- try:
- easyp = apparmor.easyprof.AppArmorEasyProfile(binary, options)
- except AppArmorException as e:
- error(e.value)
- except Exception:
- raise
+ easyp = apparmor.easyprof.AppArmorEasyProfile(binary, options)
if options.list_templates:
apparmor.easyprof.print_basefilenames(easyp.get_templates())
@@ -118,7 +113,4 @@ if __name__ == "__main__":
sys.stdout.write('%s\n' % easyp.gen_manifest(params))
else:
params['no_verify'] = options.no_verify
- try:
- easyp.output_policy(params, count, opt.output_directory)
- except AppArmorException as e:
- error(e)
+ easyp.output_policy(params, count, opt.output_directory)
--
2.5.0
More information about the AppArmor
mailing list