[apparmor] [patch] [30/38] Re-enable clear_common() call in aa-mergeprof

[Christian Boltz]

Hello,

the clear_common() call was disabled because it crashed in
delete_path_duplicates(). With the switch to FileRule, this function
no longer exists and therefore it can't crash ;-)

This patch re-enables the clear_common() call to avoid asking
superfluous questions.

References: https://bugs.launchpad.net/apparmor/+bug/1382236



[ 30-cleanprof-re-enable-clear_common.diff ]

--- utils/aa-mergeprof	2016-07-31 19:12:31.537453276 +0200
+++ utils/aa-mergeprof	2016-08-07 17:33:26.382314725 +0200
@@ -132,9 +132,7 @@
 def act(files, merge_mode, merging_profile):
     mergeprofiles = Merge(files)
     #Get rid of common/superfluous stuff
-#    mergeprofiles.clear_common()
-# mergeprofiles.clear_common() temporarily disabled because it crashes,
-# see https://bugs.launchpad.net/apparmor/+bug/1382236
+    mergeprofiles.clear_common()
 
 #    if not args.auto:
     if 1 == 1:  # workaround to avoid lots of whitespace changes




Regards,

Christian Boltz
-- 
> Hat mich etliche graue Haare gekostet. Kriegt man in solchen
> Fällen eigentlich von SuSE ne Packung Haarfärbemittel ;-)
Ja - aber nur in grün ;-)
[> Jürgen Jentsch und Peter Geerds in suse-linux]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20160812/c8fb12a9/attachment.pgp>