Launchpad itself

Merge lp:~jelmer/launchpad/buildd-trivial into lp:launchpad

  1. buildd-trivial
  2. Merge into devel
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 11322
Proposed branch: lp:~jelmer/launchpad/buildd-trivial
Merge into: lp:launchpad
Diff against target: 142 lines (+33/-9)
8 files modified
.bzrignore (+1/-1)
lib/canonical/buildd/debian/changelog (+11/-1)
lib/canonical/buildd/debian/compat (+1/-0)
lib/canonical/buildd/debian/control (+4/-4)
lib/canonical/buildd/debian/launchpad-buildd.examples (+1/-0)
lib/canonical/buildd/debian/launchpad-buildd.init (+10/-0)
lib/canonical/buildd/debian/rules (+4/-3)
lib/canonical/buildd/debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~jelmer/launchpad/buildd-trivial
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Abstain
LaMont Jones Pending
Review via email: mp+30808@code.launchpad.net

Description of the change

Collection of trivial fixes for launchpad-buildd.

Some fixes for low-hanging fruit; warnings from lintian.

Add 'prepare' rule for debian/rules which copies the right files in but doesn't build a source package (making it easier to use other build tools instead).

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Waiting for LaMont to review rather than one of the Launchpad reviewers.

review: Abstain (code)
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

<lamont> jelmer: why break package into prepare and package?
<lamont> jelmer: other than that question, +1 from me
<lamont> jelmer: and actually, we should bzr ignore all of launchpad-files, not just tachandler.py
<jelmer> lamont: Since I install launchpad-buildd locally I'd like to build a binary package, not a source package. Splitting out prepare allows me to run prepare just once and then modify / debuild as necessary.
<jelmer> lamont: I'll update bzrignore to just ignore all files in launchpad-files.
<lamont> ah, ok
...
<jelmer> lamont: diff is here: http://pastebin.ubuntu.com/476947/
<lamont> jelmer: +1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-07-15 15:57:40 +0000
+++ .bzrignore 2010-08-12 15:11:04 +0000
@@ -56,7 +56,6 @@
56.bazaar56.bazaar
57.cache57.cache
58.subversion58.subversion
59lib/canonical/buildd/launchpad-files
60.testrepository59.testrepository
61.memcache.pid60.memcache.pid
62./pipes61./pipes
@@ -77,3 +76,4 @@
77lib/canonical/launchpad-buildd_*_source.build76lib/canonical/launchpad-buildd_*_source.build
78lib/canonical/launchpad-buildd_*_source.changes77lib/canonical/launchpad-buildd_*_source.changes
79lib/canonical/buildd/debian/*78lib/canonical/buildd/debian/*
79lib/canonical/buildd/launchpad-files/*
8080
=== renamed file 'daemons/buildd-slave-example.conf' => 'lib/canonical/buildd/buildd-slave-example.conf'
=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog 2010-08-05 21:12:36 +0000
+++ lib/canonical/buildd/debian/changelog 2010-08-12 15:11:04 +0000
@@ -1,9 +1,19 @@
1launchpad-buildd (68) UNRELEASED; urgency=low1launchpad-buildd (68) UNRELEASED; urgency=low
22
3 [ William Grant ]
3 * Take an 'arch_tag' argument, so the master can override the slave4 * Take an 'arch_tag' argument, so the master can override the slave
4 architecture.5 architecture.
56
6 -- William Grant <wgrant@ubuntu.com> Sun, 01 Aug 2010 22:00:32 +10007 [ Jelmer Vernooij ]
8
9 * Explicitly use source format 1.0.
10 * Add LSB information to init script.
11 * Use debhelper >= 5 (available in dapper, not yet deprecated in
12 maverick).
13 * Fix spelling in description.
14 * Install example buildd configuration.
15
16 -- Jelmer Vernooij <jelmer@canonical.com> Thu, 12 Aug 2010 17:04:14 +0200
717
8launchpad-buildd (67) hardy-cat; urgency=low18launchpad-buildd (67) hardy-cat; urgency=low
919
1020
=== added file 'lib/canonical/buildd/debian/compat'
--- lib/canonical/buildd/debian/compat 1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/compat 2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
15
02
=== modified file 'lib/canonical/buildd/debian/control'
--- lib/canonical/buildd/debian/control 2010-05-19 15:50:27 +0000
+++ lib/canonical/buildd/debian/control 2010-08-12 15:11:04 +0000
@@ -3,15 +3,15 @@
3Priority: extra3Priority: extra
4Maintainer: Adam Conrad <adconrad@ubuntu.com>4Maintainer: Adam Conrad <adconrad@ubuntu.com>
5Standards-Version: 3.5.95Standards-Version: 3.5.9
6Build-Depends-Indep: debhelper (>= 4)6Build-Depends-Indep: debhelper (>= 5)
77
8Package: launchpad-buildd8Package: launchpad-buildd
9Section: misc9Section: misc
10Architecture: all10Architecture: all
11Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache211Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2, ${misc:Depends}
12Description: Launchpad buildd slave12Description: Launchpad buildd slave
13 This is the launchpad buildd slave package. It contains everything needed to13 This is the launchpad buildd slave package. It contains everything needed to
14 get a launchpad buildd going apart from the database manipulation required to14 get a launchpad buildd going apart from the database manipulation required to
15 tell launchpad about the slave instance. If you are creating more than one15 tell launchpad about the slave instance. If you are creating more than one
16 slave instance on the same computer, be sure to give them independant configs16 slave instance on the same computer, be sure to give them independent configs
17 and independant filecaches etc.17 and independent filecaches etc.
1818
=== added file 'lib/canonical/buildd/debian/launchpad-buildd.examples'
--- lib/canonical/buildd/debian/launchpad-buildd.examples 1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/launchpad-buildd.examples 2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
1buildd-slave-example.conf
02
=== modified file 'lib/canonical/buildd/debian/launchpad-buildd.init'
--- lib/canonical/buildd/debian/launchpad-buildd.init 2010-03-31 17:10:21 +0000
+++ lib/canonical/buildd/debian/launchpad-buildd.init 2010-08-12 15:11:04 +0000
@@ -8,6 +8,16 @@
8#8#
9# Author: Daniel Silverstone <daniel.silverstone@canonical.com>9# Author: Daniel Silverstone <daniel.silverstone@canonical.com>
1010
11### BEGIN INIT INFO
12# Provides: launchpad_buildd
13# Required-Start: $local_fs $network $syslog $time
14# Required-Stop: $local_fs $network $syslog $time
15# Default-Start: 2 3 4 5
16# Default-Stop: 0 1 6
17# X-Interactive: false
18# Short-Description: Start/stop launchpad buildds
19### END INIT INFO
20
11set -e21set -e
1222
13PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin23PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
1424
=== modified file 'lib/canonical/buildd/debian/rules'
--- lib/canonical/buildd/debian/rules 2010-07-18 08:49:02 +0000
+++ lib/canonical/buildd/debian/rules 2010-08-12 15:11:04 +0000
@@ -3,7 +3,6 @@
3# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the3# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
4# GNU Affero General Public License version 3 (see the file LICENSE).4# GNU Affero General Public License version 3 (see the file LICENSE).
55
6export DH_COMPAT=4
7export DH_OPTIONS6export DH_OPTIONS
87
9# This is an incomplete debian rules file for making the launchpad-buildd deb8# This is an incomplete debian rules file for making the launchpad-buildd deb
@@ -41,6 +40,7 @@
41 etc/launchpad-buildd \40 etc/launchpad-buildd \
42 usr/share/launchpad-buildd/canonical/launchpad/daemons \41 usr/share/launchpad-buildd/canonical/launchpad/daemons \
43 usr/share/doc/launchpad-buildd42 usr/share/doc/launchpad-buildd
43 dh_installexamples
4444
45 # Do installs here45 # Do installs here
46 touch $(pytarget)/../launchpad/__init__.py46 touch $(pytarget)/../launchpad/__init__.py
@@ -89,10 +89,11 @@
89clean:89clean:
90 dh_clean90 dh_clean
9191
92package:92prepare:
93 mkdir -p launchpad-files
94 install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac93 install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac
95 cp ../launchpad/daemons/tachandler.py launchpad-files/tachandler.py94 cp ../launchpad/daemons/tachandler.py launchpad-files/tachandler.py
95
96package: prepare
96 debuild -uc -us -S97 debuild -uc -us -S
9798
98build:99build:
99100
=== added directory 'lib/canonical/buildd/debian/source'
=== added file 'lib/canonical/buildd/debian/source/format'
--- lib/canonical/buildd/debian/source/format 1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/source/format 2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
11.0
02
=== added directory 'lib/canonical/buildd/launchpad-files'