launchpad-reviewers team mailing list archive

[Steve Langasek <steve.langasek@xxxxxxxxxxxxx>]

Steve Langasek has proposed merging lp:~vorlon/maas/reconfigure-is-not-an-option into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~vorlon/maas/reconfigure-is-not-an-option/+merge/154181

The postinst is never called with 'reconfigure' as an option.  Delete all
references to this.
-- 
https://code.launchpad.net/~vorlon/maas/reconfigure-is-not-an-option/+merge/154181
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~vorlon/maas/reconfigure-is-not-an-option into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-13 08:14:16 +0000
+++ debian/changelog	2013-03-19 19:30:30 +0000
@@ -59,6 +59,10 @@
     add /MAAS if it doesn't contain it. This helps upgrades from versions
     where DEFAULT_MAAS_URL didn't use /MAAS.
 
+  [ Steve Langasek ]
+  * postinst scripts are never called with 'reconfigure' as the script
+    argument.  Remove references to this (mythical) invocation.
+
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 04 Mar 2013 11:49:44 -0500
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-12-13 10:05:52 +0000
+++ debian/maas-cluster-controller.postinst	2013-03-19 19:30:30 +0000
@@ -72,7 +72,7 @@
     configure_maas_tgt
 fi
 
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+if ([ "$1" = "configure" ] && [ -z "$2" ]) [ -n "$DEBCONF_RECONFIGURE" ]; then
 
     if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
         create_log_dir

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2012-12-03 13:13:07 +0000
+++ debian/maas-dns.postinst	2013-03-19 19:30:30 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
     # If /etc/bind/maas is empty, set_up_dns.
     if [ ! "$(ls -A /etc/bind/maas)" ]; then
         maas set_up_dns

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-11-06 16:41:05 +0000
+++ debian/maas-region-controller.postinst	2013-03-19 19:30:30 +0000
@@ -239,7 +239,7 @@
 	db_input high maas/installation-note || true
 	db_go
 
-elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
 	# Set the IP address of the interface with default route
 	db_get maas/default-maas-url
 	ipaddr="$RET"