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 <[email protected]> > > > > 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 <[email protected]> > > Acked-by: Christian Boltz <[email protected]> > > on the condition that someone acks this small patch to avoid breaking > aa-mergeprof.
Acked-by: Seth Arnold <[email protected]> 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.)
signature.asc
Description: PGP signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
