mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 14:25:52 +00:00
Code Issues Releases Wiki Activity

utils: ask_conflict_mode: drop superfluous parameters

Browse Source 
Merge branch 'cboltz-ask-conflict-mode' into 'master'
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/732
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Steve Beattie
2021-04-02 21:58:09 +00:00
parent c734839551 f931daa771
commit eb1328f18a
1 changed files with 2 additions and 2 deletions
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 aa[profile][hat]['profile'] = False
# check for and ask about conflicting exec modes # 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) prof_changed, end_profiling = ask_rule_questions(log_dict[aamode][profile][hat], combine_name(profile, hat), aa[profile][hat], ruletypes)
if prof_changed: if prof_changed:
@@ -1380,7 +1380,7 @@ def delete_all_duplicates(profile, incname, r_types):
return deleted 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''' '''ask user about conflicting exec rules'''
for oldrule in old_profile['file'].rules: for oldrule in old_profile['file'].rules:
conflictingrules = merge_profile['file'].get_exec_conflict_rules(oldrule) conflictingrules = merge_profile['file'].get_exec_conflict_rules(oldrule)