mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-04 08:15:21 +00:00
Code Issues Releases Wiki Activity

Split off UI_ShowFile() from UI_Changes

Browse Source 
UI_ShowFile() is more generic and can be used to display various (text)
files, not only diffs.

(cherry picked from commit bb3803b931,
adjusted for 2.13 branch)
This commit is contained in:
Christian Boltz
2020-05-07 01:06:05 +02:00
parent 6c638c97c5
commit 6e9dd6494b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/apparmor/ui.py
View File

@@ -254,14 +254,17 @@ def UI_Changes(oldprofile, newprofile, comments=False):
else: else:
difftemp = generate_diff_with_comments(oldprofile, newprofile) difftemp = generate_diff_with_comments(oldprofile, newprofile)
header = 'View Changes with comments' header = 'View Changes with comments'
if UI_mode == 'json': UI_ShowFile(header, difftemp.name)
jsonout = {'dialog': 'changes', 'header':header, 'filename': difftemp.name}
write_json(jsonout)
json_response('changes')["response"] # wait for response to delay deletion of difftemp (and ignore response content)
else:
subprocess.call('less %s' % difftemp.name, shell=True)
difftemp.close() difftemp.close()
def UI_ShowFile(header, filename):
if UI_mode == 'json':
jsonout = {'dialog': 'changes', 'header': header, 'filename': filename}
write_json(jsonout)
json_response('changes')["response"] # wait for response to delay deletion of filename (and ignore response content)
else:
subprocess.call('less %s' % filename, shell=True)
CMDS = {'CMD_ALLOW': _('(A)llow'), CMDS = {'CMD_ALLOW': _('(A)llow'),
'CMD_OTHER': _('(M)ore'), 'CMD_OTHER': _('(M)ore'),
'CMD_AUDIT_NEW': _('Audi(t)'), 'CMD_AUDIT_NEW': _('Audi(t)'),