launchpad-reviewers team mailing list archive

[Diogo Matsubara <matsubara@xxxxxxxxxxxxx>]

Diogo Matsubara has proposed merging lp:~matsubara/maas/fix-MAAS_URL-quotes-precise into lp:~maas-maintainers/maas/packaging.precise.sru.

Commit message:
Fix the way MAAS_URL is quoted.


Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~matsubara/maas/fix-MAAS_URL-quotes-precise/+merge/160725

Fix the way MAAS_URL is quoted.

-- 
https://code.launchpad.net/~matsubara/maas/fix-MAAS_URL-quotes-precise/+merge/160725
Your team MAAS Maintainers is requested to review the proposed merge of lp:~matsubara/maas/fix-MAAS_URL-quotes-precise into lp:~maas-maintainers/maas/packaging.precise.sru.

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-04-11 12:41:03 +0000
+++ debian/maas-cluster-controller.postinst	2013-04-24 17:42:32 +0000
@@ -83,7 +83,7 @@
     # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then
-        sed -i "s|MAAS_URL=.*|MAAS_URL='$RET'|" /etc/maas/maas_cluster.conf
+        sed -i "s|MAAS_URL=.*|MAAS_URL=\"$RET\"|" /etc/maas/maas_cluster.conf
         # Extract the hostname part.
         HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }')
         # And substitute it in-place in pserv.yaml on an indented, non-commented