[apparmor] [patch] [5/7] move ask_conflict_mode() to aa.py

[Christian Boltz]

Hello,

Am Sonntag, 15. Januar 2017, 16:25:19 CET schrieb Christian Boltz:
> [ 05-move-ask_conflict_mode.diff ]
> 
> --- utils/apparmor/aa.py        2017-01-14 23:20:29.014791326 +0100
> +++ utils/apparmor/aa.py        2017-01-14 23:47:42.507418770 +0100
> @@ -1585,6 +1585,9 @@
>                      elif ans == 'CMD_FINISHED':
>                          return
> 
> +                # check for and ask about conflicting exec modes
> +                apparmor.aa.ask_conflict_mode(profile, hat, aa[profile][hat], log_dict[aamode][profile][hat])

Actually this line should just be

+                ask_conflict_mode(profile, hat, aa[profile][hat], log_dict[aamode][profile][hat])

without the "apparmor.aa." prefix. I changed the patch locally.


Regards,

Christian Boltz
-- 
Heck, we get pushback from some people about the fact that our forum has
an NNTP interface for people who 'have failed to keep up with the times'
[Jim Henderson in opensuse-project]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20170117/ce4bf99c/attachment.pgp>