[apparmor] [Merge] lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816 into lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain

[Jamie Strandboge]

On 03/21/2014 03:59 PM, Christian Boltz wrote:
> Hello,
> 
> Am Freitag, 21. März 2014 schrieb Jamie Strandboge:
>> Jamie Strandboge has proposed merging
>> lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816 into
>> lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.
> 
>>   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
> 
>> === 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`
> 
> I doubt a regex is needed. Instead, you could use
>     find [...] -not -name '*.md5sum'
> 
ACK, thanks. I updated the MP.

-- 
Jamie Strandboge                 http://www.ubuntu.com/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 884 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140326/99f7a0dc/attachment.pgp>