diff --git a/utils/apparmor/aa.py b/utils/apparmor/aa.py index 94e66efc0..6d2eb7817 100644 --- a/utils/apparmor/aa.py +++ b/utils/apparmor/aa.py @@ -1477,15 +1477,9 @@ def set_logfile(filename): def do_logprof_pass(logmark='', out_dir=None): - # set up variables for this pass - global active_profiles -# changed = dict() - aaui.UI_Info(_('Reading log entries from %s.') % logfile) load_sev_db() - # print(pid) - # print(active_profiles) log_reader = apparmor.logparser.ReadLog(logfile, active_profiles, profile_dir) hashlog = log_reader.read_log(logmark) diff --git a/utils/apparmor/common.py b/utils/apparmor/common.py index 7fadcf33f..3152a986e 100644 --- a/utils/apparmor/common.py +++ b/utils/apparmor/common.py @@ -72,7 +72,6 @@ def msg(out, output=sys.stdout): def debug(out): """Print debug message""" - global DEBUGGING if DEBUGGING: try: print("DEBUG: %s" % (out), file=sys.stderr) diff --git a/utils/test/test-aa-easyprof.py b/utils/test/test-aa-easyprof.py index 1e677d501..fca835df0 100755 --- a/utils/test/test-aa-easyprof.py +++ b/utils/test/test-aa-easyprof.py @@ -112,8 +112,6 @@ class T(unittest.TestCase): def setUp(self): """Setup for tests""" - global topdir - self.tmpdir = os.path.realpath(tempfile.mkdtemp(prefix='test-aa-easyprof')) # Copy everything into place