mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

utils: Use apparmor.fail for AppArmorException handling in aa-easyprof

Browse Source 
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@canonical.com>
Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
Tyler Hicks
2015-12-16 16:12:59 -06:00
parent 5a2da347d4
commit df12e87fb5
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/aa-easyprof
View File

@@ -10,7 +10,7 @@
# ------------------------------------------------------------------ # ------------------------------------------------------------------
import apparmor.easyprof import apparmor.easyprof
from apparmor.easyprof import AppArmorException, error from apparmor.easyprof import error
import os import os
import sys import sys
@@ -61,12 +61,7 @@ if __name__ == "__main__":
for (binary, options) in profiles: for (binary, options) in profiles:
if len(profiles) > 1: if len(profiles) > 1:
count += 1 count += 1
try:
easyp = apparmor.easyprof.AppArmorEasyProfile(binary, options) easyp = apparmor.easyprof.AppArmorEasyProfile(binary, options)
except AppArmorException as e:
error(e.value)
except Exception:
raise
if options.list_templates: if options.list_templates:
apparmor.easyprof.print_basefilenames(easyp.get_templates()) apparmor.easyprof.print_basefilenames(easyp.get_templates())
@@ -118,7 +113,4 @@ if __name__ == "__main__":
sys.stdout.write('%s\n' % easyp.gen_manifest(params)) sys.stdout.write('%s\n' % easyp.gen_manifest(params))
else: else:
params['no_verify'] = options.no_verify params['no_verify'] = options.no_verify
try:
easyp.output_policy(params, count, opt.output_directory) easyp.output_policy(params, count, opt.output_directory)
except AppArmorException as e:
error(e)