Jamie Strandboge has proposed merging lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816 into lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.
Requested reviews: AppArmor Developers (apparmor-dev) Related bugs: Bug #1295816 in apparmor (Ubuntu): "/etc/init.d/apparmor reload complains if /var/lib/apparmor/profiles doesn't have profiles" https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1295816 For more details, see: https://code.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816/+merge/212238 -- https://code.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816/+merge/212238 Your team AppArmor Developers is requested to review the proposed merge of lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816 into lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.
=== modified file 'debian/changelog' --- debian/changelog 2014-03-21 13:36:56 +0000 +++ debian/changelog 2014-03-21 20:17:10 +0000 @@ -1,3 +1,10 @@ +apparmor (2.8.95~2430-0ubuntu3) UNRELEASED; urgency=medium + + * debian/lib/apparmor/functions: properly calculate number of profiles in + /var/lib/apparmor/profiles (LP: #1295816) + + -- Jamie Strandboge <[email protected]> Fri, 21 Mar 2014 15:04:14 -0500 + apparmor (2.8.95~2430-0ubuntu2) trusty; urgency=medium * debian/control: Depends on python-pkg-resources for python-apparmor and === modified file 'debian/lib/apparmor/functions' --- debian/lib/apparmor/functions 2013-10-08 21:30:52 +0000 +++ debian/lib/apparmor/functions 2014-03-21 20:17:10 +0000 @@ -37,7 +37,7 @@ if [ ! -d "$pdir" ]; then continue fi - num=`find "$pdir" -type f | wc -l` + num=`find "$pdir" -type f ! -regex '.*\.md5sums$' | wc -l` if [ "$num" = "0" ]; then continue fi
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
