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

Proposed by Andres Rodriguez on 2012-10-08
Status: Merged
Approved by: Raphaël Badin on 2012-10-08
Approved revision: 121
Merged at revision: 121
Proposed branch: lp:~andreserl/maas/packaging_update_cluster
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 32 lines (+5/-2)
2 files modified
debian/changelog (+2/-1)
debian/maas-cluster-controller.postinst (+3/-1)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_update_cluster
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2012-10-08 Approve on 2012-10-08
Review via email: mp+128564@code.launchpad.net

Commit message

debian/maas-cluster-controller.postinst: Only set URL if not empty.

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

Looks good.

review: Approve
MAAS Lander (maas-lander) wrote :

No commit message specified.

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 2012-10-08 17:16:30 +0000
3+++ debian/changelog 2012-10-08 18:39:20 +0000
4@@ -1,4 +1,4 @@
5-maas (0.1+bzr1199+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr1223+dfsg-0ubuntu1~ppa1) quantal; urgency=low
7
8 * New upstream release. (LP: #1062518)
9
10@@ -40,6 +40,7 @@
11 appropriate etc dir.
12 * debian/maas-cluster-controller.config: Source debconf at the beginning of the
13 script. (LP: #1063857)
14+ * debian/maas-cluster-controller.postinst: Only set URL if not empty.
15
16 [ Robie Basak ]
17 * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen
18
19=== modified file 'debian/maas-cluster-controller.postinst'
20--- debian/maas-cluster-controller.postinst 2012-10-02 02:29:02 +0000
21+++ debian/maas-cluster-controller.postinst 2012-10-08 18:39:20 +0000
22@@ -37,7 +37,9 @@
23 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
24 # Get the MAAS_URL on configure/reconfigure and write it to the conf file.
25 db_get maas-cluster-controller/maas-url || true
26- sed -i "s|MAAS_URL=.*|MAAS_URL="$RET"|" /etc/maas/maas_cluster.conf
27+ if [ -n "$RET" ]; then
28+ sed -i "s|MAAS_URL=.*|MAAS_URL="$RET"|" /etc/maas/maas_cluster.conf
29+ fi
30 fi
31
32 #DEBHELPER#

Subscribers

People subscribed via source and target branches

to all changes: