launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1076028 in maas (Ubuntu): "maas-cluster-controller should conflict with tftpd-hpa"
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1076028

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging.raring-updates/+merge/134199
-- 
https://code.launchpad.net/~andreserl/maas/packaging.raring-updates/+merge/134199
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-13 12:09:44 +0000
+++ debian/changelog	2012-11-13 20:48:36 +0000
@@ -28,6 +28,14 @@
   * debian/maas-cluster-controller.install: maas-import-squashfs and its
     configuration file are no longer part of upstream.
 
+  [ Andres Rodriguez ]
+  * debian/control:
+    - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
+    - maas-dns: Conflicts with dnsmasq
+  * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
+    it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
+    didn't use /MAAS.
+
  -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Fri, 26 Oct 2012 12:50:20 +0200
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-10-29 14:18:01 +0000
+++ debian/control	2012-11-13 20:48:36 +0000
@@ -17,7 +17,7 @@
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
-Conflicts: dnsmasq, maas-provision, tftpd-hpa
+Conflicts: maas-provision
 Replaces: maas-provision
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -184,7 +184,7 @@
          ${misc:Depends},
          ${python:Depends}
 Suggests: maas-dhcp (= ${binary:Version})
-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Cluster Controller
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -260,7 +260,7 @@
  maas-region-controller (= ${binary:Version}),
  maas-dhcp (= ${binary:Version}),
  ${misc:Depends}
-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DNS configuration (metapackage)
  Ubuntu MAAS Server is the successor to Orchestra. It offers a

=== modified file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	2012-10-08 17:16:30 +0000
+++ debian/maas-cluster-controller.config	2012-11-13 20:48:36 +0000
@@ -14,6 +14,11 @@
         # Attempt to pre-populate if installing on the region controller.
         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)
+            # If the URL doesn't end in /MAAS then add it. This helps upgrades from
+            # precise for which the URL didn't contain /MAAS, which is now required
+            if ! echo $url | grep -qs "/MAAS$"; then
+                url="${url}/MAAS"
+            fi
             db_set maas-cluster-controller/maas-url "$url"
         else
             # Will only get here if dbconf value not already set, or