Merge lp:~julian-edwards/maas/detect-url-bug-1059416 into lp:~maas-maintainers/maas/packaging

[Julian Edwards]

  * Make maas-cluster-controller autoconfigure itself when upgrading from the
    old maas package. (LP: #1059416)
  * Add missing prerm file for maas-cluster-controller so that .pyc files
    are cleaned up. (LP: #1059973)

[Julian Edwards (julian-edwards)]

No pre-imp done! But it's all been tested successfully on my HP cubes.

[Jeroen T. Vermeulen (jtv)]

Just the presence of the .prerm file is enough to get the .pyc files cleaned up!?

Looks a bit weird to me to update an existing debian/changelog entry instead of adding a new one, but I trust you have your reasons.

review: Approve

[Julian Edwards (julian-edwards)]

On Wednesday 03 October 2012 09:00:43 you wrote:
> Review: Approve
>
> Just the presence of the .prerm file is enough to get the .pyc files cleaned
> up!?

No, the #DEBHELPER# bit does the trick. It gets replaced with some magic when
the package is built!

> Looks a bit weird to me to update an existing debian/changelog entry instead
> of adding a new one, but I trust you have your reasons.

Because it's not released yet. We only add entries generally when releasing.

(I use "dch -e" to edit and "dch -i" to add a new one)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-03 01:35:15 +0000
+++ debian/changelog	2012-10-03 06:53:21 +0000
@@ -1,10 +1,14 @@
-maas (0.1+bzr1137+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (0.1+bzr1139+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * New upstream release.
 
   [ Julian Edwards ]
   * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
   * Ensure maas-dns creates the maas user before trying to chown files.
+  * Make maas-cluster-controller autoconfigure itself when upgrading from the
+    old maas package. (LP: #1059416)
+  * Add missing prerm file for maas-cluster-controller so that .pyc files
+    are cleaned up. (LP: #1059973)
 
   [ Raphaël Badin ]
   * Split celery config into cluster and region configs.
@@ -26,7 +30,7 @@
   * debian/control: Depends on python-netifaces.
   * debian/maas-region-controller: Install maas-import-squashfs
 
- -- Julian Edwards <[e-mail]>  Wed, 03 Oct 2012 11:26:05 +1000
+ -- Julian Edwards <[e-mail]>  Wed, 03 Oct 2012 16:49:24 +1000
 
 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	2012-10-02 02:29:02 +0000
+++ debian/maas-cluster-controller.config	2012-10-03 06:53:21 +0000
@@ -1,9 +1,8 @@
 #!/bin/sh -e
 
 # Only ask for new installations and reconfiguring.
-# XXX Fix to not ask during new installations when upgrading from the old
-# maas package or installing from the CD.
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then
+# XXX Fix to not ask when installing from the CD.
+if ([ "$1" = "configure" ] && [ -z "$2" ]); then
     . /usr/share/debconf/confmodule
 
     db_get maas-cluster-controller/maas-url || true
@@ -14,8 +13,16 @@
         if [ -e /etc/maas/maas_local_settings.py ]; then
             url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
             db_set maas-cluster-controller/maas-url "$url"
+        else
+            # Will only get here if dbconf value not already set, or
+            # /etc/maas/maas_local_settings.py doesn't exist.
+            db_input medium maas-cluster-controller/maas-url || true
+            db_go
         fi
     fi
+fi
+
+if [ "$1" = "reconfigure" ]; then
     db_input high maas-cluster-controller/maas-url || true
     db_go
 fi

=== added file 'debian/maas-cluster-controller.prerm'
--- debian/maas-cluster-controller.prerm	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.prerm	2012-10-03 06:53:21 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+exit 0

=== modified file 'debian/maas-cluster-controller.templates'
--- debian/maas-cluster-controller.templates	2012-09-20 07:21:58 +0000
+++ debian/maas-cluster-controller.templates	2012-10-03 06:53:21 +0000
@@ -1,6 +1,7 @@
 Template: maas-cluster-controller/maas-url
 Type: string
-Default: http://<MAAS host>/MAAS
+Default:
 _Description: Ubuntu MAAS API address:
  The MAAS Cluster Controller needs to contact the MAAS server to
- register its presence.  Set the URL to the MAAS API here.
+ register its presence.  Set the URL to the MAAS API here, e.g.
+ http://192.168.1.1/MAAS