[apparmor] [PATCH 1/2] Introduce UI_Changes functions.

[Seth Arnold]

On Thu, Oct 26, 2017 at 12:12:25AM +0200, Christian Boltz wrote:
> Hello,
> 
> Am Montag, 23. Oktober 2017, 12:38:33 CEST schrieb Goldwyn Rodrigues:
> > From: Goldwyn Rodrigues <rgoldwyn at suse.com>
> > 
> > This is a preparation patch to use for JSON mode of conveying
> > diff filename. In this patch we move diff generation functions to UI.
> > In the process, I have cleaned up the code to reduce code and enable
> > reuse.
> > 
> > Remove unused function get_profile_diff().
> > 
> > Signed-off-by: Goldwyn Rodrigues <rgoldwyn at suse.com>
> 
> Acked-by: Christian Boltz <apparmor at cboltz.de>
> 
> on the condition that someone acks this small patch to avoid breaking 
> aa-mergeprof.

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> Hint: Whenever you delete a function, grep -r for it ;-)
> 
> 
> === modified file 'utils/aa-mergeprof'
> --- utils/aa-mergeprof  2017-03-02 21:21:53 +0000
> +++ utils/aa-mergeprof  2017-10-25 22:01:19 +0000
> @@ -128,7 +128,7 @@
>                      apparmor.aa.original_aa[program] = apparmor.aa.deepcopy(apparmor.aa.aa[program])
>                  #oldprofile = apparmor.serialize_profile(apparmor.original_aa[program], program, '')
>                  newprofile = apparmor.aa.serialize_profile(mergeprofiles.user.aa[program], program, '')
> -                apparmor.aa.display_changes_with_comments(mergeprofiles.user.filename, newprofile)
> +                aaui.UI_Changes(mergeprofiles.user.filename, newprofile, comments=True)
>              elif ans == 'CMD_IGNORE_ENTRY':
>                  break
> 
>  
> (I'll commit this together with the main patch.)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20171025/3118c212/attachment.sig>