yellow team mailing list archive

[Francesco Banconi <francesco.banconi@xxxxxxxxxxxxx>]

Francesco Banconi has proposed merging lp:~frankban/lpsetup/postgres-9.1 into lp:lpsetup.

Requested reviews:
  Launchpad Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~frankban/lpsetup/postgres-9.1/+merge/105070

== Changes ==

Updated launchpad packages list to include postgres 9.1.

Removed workaround for bug 892892: fix released.

Added workaround for bug 959352.

Version 0.2: testing story hopefully ready.

-- 
https://code.launchpad.net/~frankban/lpsetup/postgres-9.1/+merge/105070
Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~frankban/lpsetup/postgres-9.1 into lp:lpsetup.

=== modified file 'lpsetup/__init__.py'
--- lpsetup/__init__.py	2012-04-23 17:15:00 +0000
+++ lpsetup/__init__.py	2012-05-08 13:47:19 +0000
@@ -9,7 +9,7 @@
     'get_version',
     ]
 
-VERSION = (0, 1, 3)
+VERSION = (0, 2, 0)
 
 
 def get_version():

=== modified file 'lpsetup/settings.py'
--- lpsetup/settings.py	2012-05-07 10:27:17 +0000
+++ lpsetup/settings.py	2012-05-08 13:47:19 +0000
@@ -46,6 +46,9 @@
     )
 LP_CHECKOUT = 'devel'
 LP_PACKAGES = [
+    # "launchpad-database-dependencies-9.1" can be removed once 8.x is
+    # no longer an option in "launchpad-developer-dependencies.
+    'launchpad-database-dependencies-9.1',
     'launchpad-developer-dependencies', 'apache2',
     'apache2-mpm-worker', 'libapache2-mod-wsgi'
     ]

=== modified file 'lpsetup/subcommands/install.py'
--- lpsetup/subcommands/install.py	2012-04-10 13:01:32 +0000
+++ lpsetup/subcommands/install.py	2012-05-08 13:47:19 +0000
@@ -182,9 +182,6 @@
             assume_yes = None if distro == 'lucid' else '-y'
             call('add-apt-repository', assume_yes,
                  reposirory.format(distro=distro))
-        # XXX frankban 2012-01-13 - Bug 892892: upgrading mountall in LXC
-        # containers currently does not work.
-        call("echo 'mountall hold' | dpkg --set-selections", shell=True)
     call('apt-get', 'update')
     # Install base and Launchpad deb packages.
     apt_get_install(*LP_PACKAGES, LANG='C', caller=call)

=== modified file 'lpsetup/subcommands/lxcinstall.py'
--- lpsetup/subcommands/lxcinstall.py	2012-05-07 10:27:17 +0000
+++ lpsetup/subcommands/lxcinstall.py	2012-05-08 13:47:19 +0000
@@ -169,6 +169,12 @@
         'DEBIAN_FRONTEND=noninteractive '
         'apt-get upgrade -y && apt-get install -y lpsetup',
         key=ssh_key_path)
+    # XXX benji 2012-03-19 bug=959352: this is so graphviz will work in an
+    # ephemeral container
+    ssh(lxc_name, 'mkdir -p /rootfs/usr/lib', key=ssh_key_path)
+    ssh(lxc_name,
+        'ln -s /usr/lib/graphviz /rootfs/usr/lib/graphviz',
+        key=ssh_key_path)
 
 
 def setup_launchpad_lxc(