mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 00:14:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:43 -06:00
parent 2f70c5a1bc
commit e493338add
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/aa-easyprof
View file

@ -10,7 +10,7 @@
# ------------------------------------------------------------------
import apparmor.easyprof
from apparmor.easyprof import AppArmorException, error
from apparmor.easyprof import error
import os
import sys
@ -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)