MAAS

Merge lp:~andreserl/maas/packaging_updates_bzr1099-2 into lp:~maas-maintainers/maas/packaging

  1. packaging_updates_bzr1099-2
  2. Merge into packaging
Proposed by Andres Rodriguez on 2012-10-08
Status: Merged
Approved by: Andres Rodriguez on 2012-10-08
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~andreserl/maas/packaging_updates_bzr1099-2
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 68 lines (+10/-4)
4 files modified
debian/changelog (+5/-3)
debian/maas-cluster-controller.config (+3/-1)
debian/maas-cluster-controller.postrm (+1/-0)
debian/maas-cluster-controller.prerm (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_updates_bzr1099-2
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2012-10-08 Approve on 2012-10-08
Review via email: mp+128551@code.launchpad.net

Commit Message

debian/maas-cluster-controller.config: Source debconf at the beginning of the
  script. (LP: #1063857)

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

Looks good to me (but please not that I just learned when /usr/share/debconf/confmodule is :)).

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-10-05 10:36:43 +0000
3+++ debian/changelog 2012-10-08 17:22:18 +0000
4@@ -1,6 +1,6 @@
5-maas (0.1+bzr1170+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr1199+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8- * New upstream release.
9+ * New upstream release. (LP: #1062518)
10
11 [ Julian Edwards ]
12 * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
13@@ -38,12 +38,14 @@
14 * update po files for the templates.
15 * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
16 appropriate etc dir.
17+ * debian/maas-cluster-controller.config: Source debconf at the beginning of the
18+ script. (LP: #1063857)
19
20 [ Robie Basak ]
21 * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen
22 by postinst.
23
24- -- Robie Basak <robie.basak@ubuntu.com> Fri, 05 Oct 2012 11:35:25 +0100
25+ -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 13:10:23 -0400
26
27 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
28
29
30=== modified file 'debian/maas-cluster-controller.config'
31--- debian/maas-cluster-controller.config 2012-10-03 06:08:41 +0000
32+++ debian/maas-cluster-controller.config 2012-10-08 17:22:18 +0000
33@@ -1,9 +1,11 @@
34 #!/bin/sh -e
35
36+. /usr/share/debconf/confmodule
37+db_version 2.0
38+
39 # Only ask for new installations and reconfiguring.
40 # XXX Fix to not ask when installing from the CD.
41 if ([ "$1" = "configure" ] && [ -z "$2" ]); then
42- . /usr/share/debconf/confmodule
43
44 db_get maas-cluster-controller/maas-url || true
45 if [ -n "$RET" ]; then
46
47=== modified file 'debian/maas-cluster-controller.postrm'
48--- debian/maas-cluster-controller.postrm 2012-09-29 02:25:18 +0000
49+++ debian/maas-cluster-controller.postrm 2012-10-08 17:22:18 +0000
50@@ -3,6 +3,7 @@
51 set -e
52
53 . /usr/share/debconf/confmodule
54+db_version 2.0
55
56 case "$1" in
57 purge)
58
59=== modified file 'debian/maas-cluster-controller.prerm'
60--- debian/maas-cluster-controller.prerm 2012-10-03 06:47:57 +0000
61+++ debian/maas-cluster-controller.prerm 2012-10-08 17:22:18 +0000
62@@ -3,6 +3,7 @@
63 set -e
64
65 . /usr/share/debconf/confmodule
66+db_version 2.0
67
68 #DEBHELPER#
69

Subscribers

People subscribed via source and target branches

to all changes: