Merge lp:~jdstrand/click-apparmor/lp1383858 into lp:click-apparmor

[Jamie Strandboge]

aa-clickhook: disable expr tree simplification when calling the parser since this considerably slows down click policy compiles (LP: #1383858).

Installing click-appamor and python3-apparmor-click show that profiles are being loaded with the added option:

$ ps auxww|grep apparmor_parser
root 29828 0.0 0.2 34808 21520 pts/45 R+ 12:00 0:00 /sbin/apparmor_parser -r --write-cache -O no-expr-simplify --cache-loc=/var/cache/apparmor /var/lib/apparmor/profiles/click_com.ubuntu.developer.jdstrand.applicationlifecycleapp_ApplicationLifecycleApp_0.1

[Steve Beattie (sbeattie)]

This patch looks good to me, thanks!

review: Approve

=== modified file 'aa-clickhook'
--- aa-clickhook	2014-10-07 14:32:06 +0000
+++ aa-clickhook	2014-10-22 16:05:18 +0000
@@ -151,8 +151,11 @@
         warn("AppArmor not available when processing AppArmor hook")
 
     if is_available:
+        # LP: #1383858 - expr tree simplification is too slow for click policy
+        # so disable it for now
         click.load_profiles(load_profiles,
                             args=['-r', '--write-cache',
+                                  '-O', 'no-expr-simplify',
                                   '--cache-loc=%s' % apparmor_cache])
 
         # missing_clicks has the profile filename so we need to find the
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-10-07 18:35:58 +0000
+++ debian/changelog	2014-10-22 16:05:18 +0000
@@ -1,3 +1,10 @@
+click-apparmor (0.2.11.1+rtm1) 14.09; urgency=medium
+
+  * aa-clickhook: disable expr tree simplification when calling the parser
+    since this considerably slows down click policy compiles (LP: #1383858)
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 22 Oct 2014 11:39:55 -0400
+
 click-apparmor (0.2.11.1) utopic; urgency=medium
 
   * aa-clickhook: don't remove the lock file so we can properly handle 3 or