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

fail.py: handle missing cgitb

Browse Source 
It's no longer in python standard library starting
at version 3.13. Fixes:

root@qemuarm64:~# aa-complain /etc/apparmor.d/*
Traceback (most recent call last):
  File "/usr/sbin/aa-complain", line 18, in <module>
    from apparmor.fail import enable_aa_exception_handler
  File "/usr/lib/python3.13/site-packages/apparmor/fail.py", line 12, in <module>
    import cgitb
ModuleNotFoundError: No module named 'cgitb'

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
This commit is contained in:
Mikko Rapeli
2024-11-29 13:46:32 +00:00
parent 420945139c
commit 434e34bb51
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
utils/apparmor/fail.py
View File

@@ -8,7 +8,11 @@
# #
# ------------------------------------------------------------------ # ------------------------------------------------------------------
import cgitb try:
import cgitb
except ImportError:
cgitb = None
pass
import sys import sys
import traceback import traceback
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
@@ -32,20 +36,21 @@ def handle_exception(*exc_info):
print('', file=sys.stderr) print('', file=sys.stderr)
error(ex.value) error(ex.value)
else: else:
with NamedTemporaryFile('w', prefix='apparmor-bugreport-', suffix='.txt', delete=False) as file: if cgitb:
cgitb_hook = cgitb.Hook(display=1, file=file, format='text', context=10) with NamedTemporaryFile('w', prefix='apparmor-bugreport-', suffix='.txt', delete=False) as file:
cgitb_hook.handle(exc_info) cgitb_hook = cgitb.Hook(display=1, file=file, format='text', context=10)
cgitb_hook.handle(exc_info)
file.write('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues\n') file.write('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues\n')
file.write('and attach this file.\n') file.write('and attach this file.\n')
print(''.join(traceback.format_exception(*exc_info)), file=sys.stderr) print(''.join(traceback.format_exception(*exc_info)), file=sys.stderr)
print('', file=sys.stderr)
print('An unexpected error occurred!', file=sys.stderr) print('An unexpected error occurred!', file=sys.stderr)
print('', file=sys.stderr) print('', file=sys.stderr)
print('For details, see %s' % file.name, file=sys.stderr) if cgitb:
print('For details, see %s' % file.name, file=sys.stderr)
print('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues', file=sys.stderr) print('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues', file=sys.stderr)
print('and attach this file.', file=sys.stderr) if cgitb:
print('and attach this file.', file=sys.stderr)
def enable_aa_exception_handler(): def enable_aa_exception_handler():