Merge lp:~henninge/launchpad/bug-557347-packaging into lp:launchpad

[Henning Eggers]

Improved buildd installation by adding a preinst script that checks for running builds. Also added apache2 dependency.

Nice additions to keep the admins happy.

Adding the apache2 dependency is trivial.

The new preinst script works on the simple fact that the 'buildlog' file is removed after each build and thus can serve as an indicator for a running build. This was discussed with bigjools.

The changelog also refers to an important change by wgrant that has so far not reached the builders.

[Jelmer Vernooij (jelmer)]

Was it intentional to mention the changes from Danilo in the changelog now as well?

Otherwise, seems good.

review: Approve (code*)

[Henning Eggers (henninge)]

Yes, as they were not mentioned before. Neither were wgrant's. But there seems to be some mix-up with the version numbering anyway, so I might have to change that again.

[Michael Nelson (michael.nelson)]

review: Approve (code)

[Jelmer Vernooij (jelmer)]

61 seems like the most appropriate version string.

=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2010-05-17 15:56:29 +0000
+++ lib/canonical/buildd/debian/changelog	2010-05-21 11:22:28 +0000
@@ -1,8 +1,18 @@
-launchpad-buildd (60.1) lucid-cat; urgency=low
-
-  * Improve output of build xmplrpc call.
-
- -- Henning Eggers <[e-mail]>  Mon, 17 May 2010 15:58:48 +0200
+launchpad-buildd (61) UNRELEASED; urgency=high
+
+  [William Grant]
+  * Fixed translation templates slave to return files properly. LP#549422
+
+  [Danilo Segan]
+  * Added more output to generate-translation-templates. LP#580345
+
+  [Henning Eggers]
+  * Improved output of build xmplrpc call, not returning None now. LP#581746
+  * Added apache2 dependency. LP#557634
+  * Added preinst script to prevent installation when a build is running.
+    LP#557347
+
+ -- Henning Eggers <[e-mail]>  Wed, 19 May 2010 18:51:38 +0200
 
 launchpad-buildd (60) lucid-cat; urgency=low
 
 
=== modified file 'lib/canonical/buildd/debian/control'
--- lib/canonical/buildd/debian/control	2010-04-23 04:59:16 +0000
+++ lib/canonical/buildd/debian/control	2010-05-21 11:22:28 +0000
@@ -8,7 +8,7 @@
 Package: launchpad-buildd
 Section: misc
 Architecture: all
-Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release
+Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2
 Description: Launchpad buildd slave
  This is the launchpad buildd slave package. It contains everything needed to
  get a launchpad buildd going apart from the database manipulation required to
 
=== added file 'lib/canonical/buildd/debian/preinst'
--- lib/canonical/buildd/debian/preinst	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/preinst	2010-05-21 11:22:28 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# Pre install script
+
+set -e
+set -u
+
+BUILDLOG=/home/buildd/filecache-default/buildlog
+
+test ! -e $BUILDLOG && exit 0
+
+cat 1>&2 <<EOF
+**************************************************
+Unable to install buildd while a build is running.
+Please set the builder to 'manual' and wait for
+the current build to finish.
+
+If you are certain this is an error, please remove
+/home/buildd/filecache-default/buildlog
+and retry the installation.
+**************************************************
+EOF
+
+exit 1