2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00

Fix redefinition of _

... which unsurprisingly broke using the translations.

This was a regression introduced in 4f51c93f9d

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/387
This commit is contained in:
Christian Boltz
2024-04-21 17:32:24 +02:00
parent a07a0f4428
commit 6f9e841e74

View File

@@ -90,7 +90,7 @@ class aa_tools:
def get_next_for_modechange(self): def get_next_for_modechange(self):
"""common code for mode/flags changes""" """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 output_name = prof_filename if program is None else program
if not os.path.isfile(prof_filename) or is_skippable_file(prof_filename): if not os.path.isfile(prof_filename) or is_skippable_file(prof_filename):
@@ -162,7 +162,7 @@ class aa_tools:
def cmd_autodep(self): def cmd_autodep(self):
apparmor.loadincludes() 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: if not program:
aaui.UI_Info(_('Please pass an application to generate a profile for, not a profile itself - skipping %s.') % prof_filename) aaui.UI_Info(_('Please pass an application to generate a profile for, not a profile itself - skipping %s.') % prof_filename)
continue continue