Merge lp:~andreserl/maas/packaging_lp1236786 into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2013-10-08
Status: Merged
Approved by: Andres Rodriguez on 2013-10-08
Approved revision: 213
Merged at revision: 208
Proposed branch: lp:~andreserl/maas/packaging_lp1236786
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 26 lines (+4/-2)
2 files modified
debian/changelog (+3/-1)
debian/maas-dhcp.postinst (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_lp1236786
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2013-10-08
Launchpad code reviewers 2013-10-08 Pending
Review via email: mp+189897@code.launchpad.net

Commit message

d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing
to install maas-dhcp during an ISO install. (LP: #1236786)

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

tested!

review: Approve

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 2013-10-07 20:10:56 +0000
3+++ debian/changelog 2013-10-08 15:52:46 +0000
4@@ -1,7 +1,9 @@
5-maas (1.4+bzr1656+dfsg-0ubuntu3) UNRELEASED; urgency=low
6+maas (1.4+bzr1676+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
9 * d/control: Bump depends on python-django to 1.4. (LP: #1236572)
10+ * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing
11+ to install maas-dhcp during an ISO install. (LP: #1236786)
12
13 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 04 Oct 2013 12:33:05 -0400
14
15
16=== modified file 'debian/maas-dhcp.postinst'
17--- debian/maas-dhcp.postinst 2013-03-19 21:55:03 +0000
18+++ debian/maas-dhcp.postinst 2013-10-08 15:52:46 +0000
19@@ -8,7 +8,7 @@
20 dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
21 if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
22 then
23- apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
24+ apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true
25 fi
26 fi
27

Subscribers

People subscribed via source and target branches

to all changes: