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

Proposed by Diogo Matsubara on 2013-04-24
Status: Merged
Approved by: Andres Rodriguez on 2013-04-24
Approved revision: 174
Merged at revision: 174
Proposed branch: lp:~matsubara/maas/fix-MAAS_URL-quotes
Merge into: lp:~maas-maintainers/maas/packaging
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
Reviewer Review Type Date Requested Status
Gavin Panella (community) 2013-04-24 Needs Information on 2013-04-24
Andres Rodriguez (community) Approve on 2013-04-24
Review via email: mp+160722@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
Gavin Panella (allenap) wrote :

I don't see how this - or lp:~matsubara/maas/fix-MAAS_URL-quotes-quantal or lp:~matsubara/maas/fix-MAAS_URL-quotes-precise - addresses bug 1172303.

The integration test is looking for:

 ¬†MAAS_URL='http://192.168.21.5/MAAS'

but the string it's looking in only contains:

 ¬†MAAS_URL=http://192.168.21.5/MAAS

i.e. the same thing without single quotes. Something is writing that config file without quotes. This branch does not deal with that.

review: Needs Information
Diogo Matsubara (matsubara) wrote :

Gavin, I updated all the packaging branches to have the same quoting and will update the CI tests to look for double quotes. If we still see no quotes at all, then I'll need to find out what config is doing that.

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 01:38:28 +0000
3+++ debian/maas-cluster-controller.postinst 2013-04-24 17:38:27 +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