[apparmor] [utils][patch] Enable 2-way merge in aa-mergeprof

[Kshitij Gupta]

Hello,

On Jul 29, 2014 4:42 PM, "Christian Boltz" <apparmor at cboltz.de> wrote:
>
> Hello,
>
> Am Montag, 28. Juli 2014 schrieb Kshitij Gupta:
> > As cboltz suggested it'd be nice to have a 2-way merge feature in
> > aa-mergeprof. Here's the patch that does the same.
> >
> > This patch modifies aa-mergeprof to:
> > -allow users to merge two profiles (2-way merge) using aa-mergeprof by
> > making the third profile optional
> > -re-enable code that cleaned up base and other profile and using it in
> > deleted count (was disabled due to pyflakes thinking it was unused)
> >
> > Testing: Some basic comparative testing between the 3-way merge hack
> > (as used by cboltz) and the new 2-way merge.
>
> I also gave it some testing (both 2-way and 3-way) - works :-)
>
> > To-Do: Add some tests for aa-mergeprof
>
> Indeed, that would have uncovered the aa-mergeprof breakage much
> earlier ;-)
>
> > === modified file 'utils/aa-mergeprof'
> > --- utils/aa-mergeprof    2014-07-27 22:24:26 +0000
> > +++ utils/aa-mergeprof    2014-07-28 10:17:46 +0000
> > @@ -25,26 +25,31 @@
> ...
> > +# 2-way merge or 3-way merge based on number of params
> > +merge_mode = 2 if args.other == None else 3
> > +
> > +print(_('Running tool in %s-way merge mode')%merge_mode)
> > +
>
> This looks like forgotten debug code - I'll remove the "print" and the
> empty line.
>

No it wasnt debug code (I even used translation string ;) ). I was aiming
to be verbose about the mode of operation for the tool. I guess it was
unnecessary.

> Besides that,
> Acked-by: Christian Boltz <apparmor at cboltz.de>
> and commited to bzr.
>
Thanks. :)

Regards,

Kshitij Gupta

>
> Regards,
>
> Christian Boltz
> --
> > [lost password] Not that i know much of encrypted FS's, but id say you
> > are pretty lost by then. Unless you can brutecrack the encryption with
> > some forensics software...
> Start looking for post-it notes near the console....
> [> Antun Balaz and Tom Knight in suse-security]
>
>
> --
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140730/d31d1223/attachment.html>