-
Committer:
Christian Boltz
-
Date:
2017-01-19 15:48:44 UTC
-
Revision ID:
apparmor@cboltz.de-20170119154844-x5p32we6cm3so42j
[5/7] move ask_conflict_mode() to aa.py
The function is an exact copy of the code in aa-mergeprof (except
removing the 'self' function parameter and changing the whitespace
level)
Also add a ask_conflict_mode() call to aa.py ask_the_questions().
This is needed for aa-mergeprof, and won't hurt in aa-logprof mode
because handle_children() already handles all exec events.
Acked-by: Seth Arnold <seth.arnold@canonical.com>