mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ask_conflict_mode: drop superfluous parameters

Browse source 
profile and hat are not needed by this function.
This commit is contained in:
Christian Boltz 2021-04-02 17:48:47 +02:00
parent c734839551
commit f931daa771
Failed to generate hash of commit
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/apparmor/aa.py
View file

@ -1122,7 +1122,7 @@ def ask_the_questions(log_dict):
aa[profile][hat]['profile'] = False
# check for and ask about conflicting exec modes
ask_conflict_mode(profile, hat, aa[profile][hat], log_dict[aamode][profile][hat])
ask_conflict_mode(aa[profile][hat], log_dict[aamode][profile][hat])
prof_changed, end_profiling = ask_rule_questions(log_dict[aamode][profile][hat], combine_name(profile, hat), aa[profile][hat], ruletypes)
if prof_changed:
@ -1380,7 +1380,7 @@ def delete_all_duplicates(profile, incname, r_types):
return deleted
def ask_conflict_mode(profile, hat, old_profile, merge_profile):
def ask_conflict_mode(old_profile, merge_profile):
'''ask user about conflicting exec rules'''
for oldrule in old_profile['file'].rules:
conflictingrules = merge_profile['file'].get_exec_conflict_rules(oldrule)