launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 16:19:24 +0000
+++ debian/changelog	2012-10-09 18:52:23 +0000
@@ -1,8 +1,12 @@
-maas (0.1+bzr1239+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1240+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/patches/99-temporary-fix-constraints.patch: Dropped.
-  * debian/control: ${python:Depends} for maas-common.
+  * debian/control:
+    - ${python:Depends} for maas-common.
+    - Add missing Depends for python-maas-provisioningserver (LP: #1064542)
+  * debian/maas-cluster-controller.postinst: Create /var/log/maas if it
+    doesn't exist (LP: #1064539)
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 08 Oct 2012 17:02:56 -0400
 

=== modified file 'debian/control'
--- debian/control	2012-10-09 16:19:24 +0000
+++ debian/control	2012-10-09 18:52:23 +0000
@@ -90,7 +90,26 @@
 
 Package: python-maas-provisioningserver
 Architecture: all
-Depends: python-netifaces, ${misc:Depends}, ${python:Depends}
+Depends: python-celery,
+         python-formencode,
+         python-lockfile,
+         python-lxml,
+         python-maas-client,
+         python-netifaces,
+         python-oops,
+         python-oops-amqp,
+         python-oops-datedir-repo,
+         python-oops-twisted,
+         python-pyparsing,
+         python-tempita,
+         python-twisted-core,
+         python-twisted-web,
+         python-txamqp,
+         python-txtftp,
+         python-yaml,
+         python-zope.interface,
+         ${misc:Depends},
+         ${python:Depends}
 Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-10-08 18:33:27 +0000
+++ debian/maas-cluster-controller.postinst	2012-10-09 18:52:23 +0000
@@ -18,9 +18,22 @@
     fi
 }
 
+create_log_dir() {
+    # create log dir
+    if [ ! -d /var/log/maas/oops ]; then
+        mkdir -p /var/log/maas/oops
+    fi
+    # Give appropriate permissions
+    chown -R maas:maas /var/log/maas
+    chmod -R 775 /var/log/maas/oops
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     add_user_group
 
+    # logging
+    create_log_dir
+
     # The local celery config may contain a private cluster UUID.  Only
     # maas can read it; only root can write it.
     chown root:maas /etc/maas/maas_local_celeryconfig_cluster.py
@@ -35,6 +48,11 @@
 fi
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+
+    if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
+        create_log_dir
+    fi
+
     # Get the MAAS_URL on configure/reconfigure and write it to the conf file.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then

=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2012-10-08 17:16:30 +0000
+++ debian/maas-cluster-controller.postrm	2012-10-09 18:52:23 +0000
@@ -11,6 +11,10 @@
                 if getent passwd maas >/dev/null; then
                         deluser maas || true
                 fi
+                # remove log directory
+                if [ -d /var/log/maas ]; then
+                    rm -rf /var/log/maas
+                fi
 esac
 
 #DEBHELPER#