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

[Andres Rodriguez]

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

[Raphaël Badin (rvb)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

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