launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Commit message:
* debian/maas-region-controller.postinst: Cleanup upgrade rules.
* debian/maas-cluster-controller.postinst: Fix 'local' usage.
* debian/maas-common.install: Install celeryconfig in appropriate location.

Requested reviews:
  Andres Rodriguez (andreserl)
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_updates_refactor/+merge/127070
-- 
https://code.launchpad.net/~andreserl/maas/packaging_updates_refactor/+merge/127070
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_updates_refactor into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-26 09:43:09 +0000
+++ debian/changelog	2012-09-28 21:10:29 +0000
@@ -1,4 +1,21 @@
-maas (0.1+bzr1063+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1109+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New Upstream Release
+
+  [ Julian Edwards ]
+  * Split packaging of 'maas' into maas-{region,cluster}-controller
+    - debian/control: Update accordingly.
+    - debian/*.install: Move files accordingly
+    - debian/*.{postinst,postrm,preinst}: Move files accordingly.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Cleanup upgrade rules.
+  * debian/maas-cluster-controller.postinst: Fix 'local' usage.
+  * debian/maas-common.install: Install celeryconfig in appropriate location.
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Fri, 28 Sep 2012 16:54:28 -0400
+
+maas (0.1+bzr1063+dfsg-0ubuntu1) quantal; urgency=low
 
   * New upstream release
 

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-09-28 06:54:30 +0000
+++ debian/maas-cluster-controller.postinst	2012-09-28 21:10:29 +0000
@@ -22,7 +22,7 @@
     add_user_group
 
     if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig.py; then
-        local uuid="$(uuidgen)"
+        uuid="$(uuidgen)"
         sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
                        /etc/maas/maas_local_celeryconfig.py
     fi

=== modified file 'debian/maas-common.install'
--- debian/maas-common.install	2012-09-26 02:17:56 +0000
+++ debian/maas-common.install	2012-09-28 21:10:29 +0000
@@ -1,3 +1,3 @@
 # Install Celery Config
-debian/tmp/etc/maas/celeryconfig.py
+debian/tmp/usr/share/maas/celeryconfig.py
 debian/tmp/etc/maas/maas_local_celeryconfig.py

=== modified file 'debian/maas-common.links'
--- debian/maas-common.links	2012-09-26 02:17:56 +0000
+++ debian/maas-common.links	2012-09-28 21:10:29 +0000
@@ -1,2 +1,1 @@
 etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py
-etc/maas/celeryconfig.py usr/share/maas/celeryconfig.py

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-09-28 02:40:23 +0000
+++ debian/maas-region-controller.postinst	2012-09-28 21:10:29 +0000
@@ -255,19 +255,6 @@
 	# make sure postgresql is running
 	restart_postgresql
 
-	# If upgrading from any version lower than 0.1+bzr445+dfsg-0ubuntu1
-	# we need to update the user/group.
-	if dpkg --compare-versions "$2" lt 0.1+bzr445+dfsg-0ubuntu1; then
-		# add user/group
-		add_user_group
-		# set correct permissions
-		chown -R maas:maas /var/lib/maas/
-		chown -R maas:maas /var/log/maas
-		chown -R syslog:syslog /var/log/maas/rsyslog
-	fi
-	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
-		configure_maas_tgt
-	fi
 	# If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
 	if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then