Merge lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 147
Merged at revision: 146
Proposed branch: lp:~andreserl/maas/packaging.raring-updates
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 65 lines (+16/-3)
3 files modified
debian/changelog (+8/-0)
debian/control (+3/-3)
debian/maas-cluster-controller.config (+5/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.raring-updates
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+134199@code.launchpad.net

This proposal supersedes a proposal from 2012-11-13.

Commit message

* 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.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-13 12:09:44 +0000
3+++ debian/changelog 2012-11-13 20:48:36 +0000
4@@ -28,6 +28,14 @@
5 * debian/maas-cluster-controller.install: maas-import-squashfs and its
6 configuration file are no longer part of upstream.
7
8+ [ Andres Rodriguez ]
9+ * debian/control:
10+ - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
11+ - maas-dns: Conflicts with dnsmasq
12+ * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
13+ it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
14+ didn't use /MAAS.
15+
16 -- Julian Edwards <julian.edwards@canonical.com> Fri, 26 Oct 2012 12:50:20 +0200
17
18 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
19
20=== modified file 'debian/control'
21--- debian/control 2012-10-29 14:18:01 +0000
22+++ debian/control 2012-11-13 20:48:36 +0000
23@@ -17,7 +17,7 @@
24 Architecture: all
25 Pre-Depends: ${misc:Pre-Depends}
26 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
27-Conflicts: dnsmasq, maas-provision, tftpd-hpa
28+Conflicts: maas-provision
29 Replaces: maas-provision
30 Description: Ubuntu MAAS Server
31 Ubuntu MAAS Server is the successor to Orchestra. It offers a
32@@ -184,7 +184,7 @@
33 ${misc:Depends},
34 ${python:Depends}
35 Suggests: maas-dhcp (= ${binary:Version})
36-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
37+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa
38 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
39 Description: Ubuntu MAAS Cluster Controller
40 Ubuntu MAAS Server is the successor to Orchestra. It offers a
41@@ -260,7 +260,7 @@
42 maas-region-controller (= ${binary:Version}),
43 maas-dhcp (= ${binary:Version}),
44 ${misc:Depends}
45-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
46+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq
47 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
48 Description: Ubuntu MAAS Server - DNS configuration (metapackage)
49 Ubuntu MAAS Server is the successor to Orchestra. It offers a
50
51=== modified file 'debian/maas-cluster-controller.config'
52--- debian/maas-cluster-controller.config 2012-10-08 17:16:30 +0000
53+++ debian/maas-cluster-controller.config 2012-11-13 20:48:36 +0000
54@@ -14,6 +14,11 @@
55 # Attempt to pre-populate if installing on the region controller.
56 if [ -e /etc/maas/maas_local_settings.py ]; then
57 url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
58+ # If the URL doesn't end in /MAAS then add it. This helps upgrades from
59+ # precise for which the URL didn't contain /MAAS, which is now required
60+ if ! echo $url | grep -qs "/MAAS$"; then
61+ url="${url}/MAAS"
62+ fi
63 db_set maas-cluster-controller/maas-url "$url"
64 else
65 # Will only get here if dbconf value not already set, or

Subscribers

People subscribed via source and target branches

to all changes: