Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_lp1236786 into lp:~maas-maintainers/maas/packaging.
Commit message: d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing to install maas-dhcp during an ISO install. (LP: #1236786) Requested reviews: Andres Rodriguez (andreserl) Launchpad code reviewers (launchpad-reviewers) Related bugs: Bug #1236786 in MAAS: "ISO fails installing maas-dhcp" https://bugs.launchpad.net/maas/+bug/1236786 For more details, see: https://code.launchpad.net/~andreserl/maas/packaging_lp1236786/+merge/189897 -- https://code.launchpad.net/~andreserl/maas/packaging_lp1236786/+merge/189897 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_lp1236786 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog' --- debian/changelog 2013-10-07 20:10:56 +0000 +++ debian/changelog 2013-10-08 15:52:46 +0000 @@ -1,7 +1,9 @@ -maas (1.4+bzr1656+dfsg-0ubuntu3) UNRELEASED; urgency=low +maas (1.4+bzr1676+dfsg-0ubuntu1) UNRELEASED; urgency=low * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544) * d/control: Bump depends on python-django to 1.4. (LP: #1236572) + * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing + to install maas-dhcp during an ISO install. (LP: #1236786) -- Andres Rodriguez <[email protected]> Fri, 04 Oct 2013 12:33:05 -0400 === modified file 'debian/maas-dhcp.postinst' --- debian/maas-dhcp.postinst 2013-03-19 21:55:03 +0000 +++ debian/maas-dhcp.postinst 2013-10-08 15:52:46 +0000 @@ -8,7 +8,7 @@ dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1 then - apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" + apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true fi fi
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
