40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
|
From 553acd22324ed013d9f468aa8585518cf68b34f7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christian Boltz <apparmor@cboltz.de>
|
||
|
|
Date: Sun, 21 Apr 2024 17:32:24 +0200
|
||
|
|
Subject: [PATCH] Fix redefinition of _
|
||
|
|
|
||
|
|
... which unsurprisingly broke using the translations.
|
||
|
|
|
||
|
|
This was a regression introduced in 4f51c93f9dc2516a32bfccc79b4dcf4985e61f47
|
||
|
|
|
||
|
|
Fixes: https://gitlab.com/apparmor/apparmor/-/issues/387
|
||
|
|
---
|
||
|
|
utils/apparmor/tools.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/utils/apparmor/tools.py b/utils/apparmor/tools.py
|
||
|
|
index e8a99bbe6..f7d4a0d36 100644
|
||
|
|
--- a/utils/apparmor/tools.py
|
||
|
|
+++ b/utils/apparmor/tools.py
|
||
|
|
@@ -90,7 +90,7 @@ class aa_tools:
|
||
|
|
def get_next_for_modechange(self):
|
||
|
|
"""common code for mode/flags changes"""
|
||
|
|
|
||
|
|
- for (program, _, prof_filename) in self.get_next_to_profile():
|
||
|
|
+ for (program, ignored, prof_filename) in self.get_next_to_profile():
|
||
|
|
output_name = prof_filename if program is None else program
|
||
|
|
|
||
|
|
if not os.path.isfile(prof_filename) or is_skippable_file(prof_filename):
|
||
|
|
@@ -162,7 +162,7 @@ class aa_tools:
|
||
|
|
def cmd_autodep(self):
|
||
|
|
apparmor.loadincludes()
|
||
|
|
|
||
|
|
- for (program, _, prof_filename) in self.get_next_to_profile():
|
||
|
|
+ for (program, ignored, prof_filename) in self.get_next_to_profile():
|
||
|
|
if not program:
|
||
|
|
aaui.UI_Info(_('Please pass an application to generate a profile for, not a profile itself - skipping %s.') % prof_filename)
|
||
|
|
continue
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|