[apparmor] [utils] proposed redesign for mergeprof

[Christian Boltz]

Hello,

Am Freitag, 5. September 2014 schrieb Kshitij Gupta:
> Seems I sent out that patch a bit early, a secondary consolidated
> patch which fixes (hopefully) the issue multiple profiles in a file is
> attached.
> (Brace a for loop is removed resulting in a huge diff due to the
> indent change).

As discussed in yesterday's meeting, we'd like to include this patch in 
the 2.9 final release that is planned for this week (!)

I just updated the patch to apply on latest bzr[1] - the result is 
attached as 
    mergeprof2-rebased.diff. 

I'm also attaching
    mergeprof2-rebased-diff-ignore-whitespace.diff
which is the same patch made with "diff -w" to ignore whitespace 
changes. It's probably not a surprise that it's much shorter and easier 
to read ;-)


That already gave me a mostly working aa-mergeprof, but I soon found out 
why Kshitij said the patch is not final yet ;-)

I did the following additional fixes:
- remove some debug output (which Kshitij intentionally kept in the 
  draft patch)
- add a UI_Info to display which profile will be merged
- disable the mergeprofiles.clear_common() call because it crashes
- disable (M)ore (CMD_OTHER) because it crashes
- make (F)inish work everywhere
- change the help text so that it doesn't mention 3-way-merge until we
  implement it

Those changes are in mergeprof-fixes.diff which applies on top of 
mergeprof2-rebased.diff.


Remaining known issues I noticed while testing:
- aa-mergeprof always asks for includes, even if they are already there
- CMD_OTHER should work ;-)


Regards,

Christian Boltz

[1] actually I applied the patch against r2636, and then re-applied the 
    two commits after that
-- 
[IP-Adresse von ppp0 mit system() ermitteln]
Dazu Perl zu verwenden, ähnelt sicherlich ein wenig der Spatzenjagd
mit großkalibrigen Langrohrgeschützen...;-)
[Christian Schmidt in suse-linux]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergeprof2-rebased.diff
Type: text/x-patch
Size: 61185 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141015/caa22cf3/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergeprof2-rebased-diff-ignore-whitespace.diff
Type: text/x-patch
Size: 6807 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141015/caa22cf3/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergeprof-fixes.diff
Type: text/x-patch
Size: 5751 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141015/caa22cf3/attachment-0005.bin>