Merge lp:~matsubara/maas/fix-MAAS_URL-quotes-quantal into lp:~maas-maintainers/maas/packaging.quantal

Proposed by Diogo Matsubara on 2013-04-24
Status: Merged
Approved by: Andres Rodriguez on 2013-04-24
Approved revision: 170
Merged at revision: 170
Proposed branch: lp:~matsubara/maas/fix-MAAS_URL-quotes-quantal
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 12 lines (+1/-1)
1 file modified
debian/maas-cluster-controller.postinst (+1/-1)
To merge this branch: bzr merge lp:~matsubara/maas/fix-MAAS_URL-quotes-quantal
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2013-04-24 Approve on 2013-04-24
Review via email: mp+160723@code.launchpad.net

Commit message

Fix the way MAAS_URL is quoted.

Description of the change

Fix the way MAAS_URL is quoted.

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

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-cluster-controller.postinst'
2--- debian/maas-cluster-controller.postinst 2013-04-11 12:35:45 +0000
3+++ debian/maas-cluster-controller.postinst 2013-04-24 17:39:29 +0000
4@@ -83,7 +83,7 @@
5 # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
6 db_get maas-cluster-controller/maas-url || true
7 if [ -n "$RET" ]; then
8- sed -i "s|MAAS_URL=.*|MAAS_URL='$RET'|" /etc/maas/maas_cluster.conf
9+ sed -i "s|MAAS_URL=.*|MAAS_URL=\"$RET\"|" /etc/maas/maas_cluster.conf
10 # Extract the hostname part.
11 HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }')
12 # And substitute it in-place in pserv.yaml on an indented, non-commented

Subscribers

People subscribed via source and target branches