AppArmor

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

  1. apparmor-ubuntu-citrain.lp1295816
  2. Merge into apparmor-ubuntu-citrain
Proposed by Jamie Strandboge
Status: Merged
Approved by: Jamie Strandboge
Approved revision: 1499
Merged at revision: 1498
Proposed branch: lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816
Merge into: lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/lib/apparmor/functions (+1/-1)
To merge this branch: bzr merge lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816
Reviewer Review Type Date Requested Status
Seth Arnold Approve
Review via email: mp+212238@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Seth Arnold (seth-arnold) wrote :

Heh, nice catch. Thanks.

review: Approve
Revision history for this message
Christian Boltz (cboltz) 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'

Regards,

Christian Boltz
--
[Serieller Anschluss] Mittlerweile ist (fast) alles USB. OK, es gibt
auch Adapter, aber die kosten wieder extra. Und der Rechner soll später
nicht aussehen wie ein Tannenbaum, mit einem Bündel herabhängender
Adaptern anstatt Lametta. [Ralph Müller in suse-linux]

lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816 updated
1499. By Jamie Strandboge

use -name instead of -regex based on feedback by Christian Boltz

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-21 13:36:56 +0000
3+++ debian/changelog 2014-03-26 15:27:09 +0000
4@@ -1,3 +1,10 @@
5+apparmor (2.8.95~2430-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/lib/apparmor/functions: properly calculate number of profiles in
8+ /var/lib/apparmor/profiles (LP: #1295816)
9+
10+ -- Jamie Strandboge <jamie@ubuntu.com> Fri, 21 Mar 2014 15:04:14 -0500
11+
12 apparmor (2.8.95~2430-0ubuntu2) trusty; urgency=medium
13
14 * debian/control: Depends on python-pkg-resources for python-apparmor and
15
16=== modified file 'debian/lib/apparmor/functions'
17--- debian/lib/apparmor/functions 2013-10-08 21:30:52 +0000
18+++ debian/lib/apparmor/functions 2014-03-26 15:27:09 +0000
19@@ -37,7 +37,7 @@
20 if [ ! -d "$pdir" ]; then
21 continue
22 fi
23- num=`find "$pdir" -type f | wc -l`
24+ num=`find "$pdir" -type f ! -name '*.md5sums' | wc -l`
25 if [ "$num" = "0" ]; then
26 continue
27 fi

Subscribers

People subscribed via source and target branches

to all changes: