Merge lp:~jtv/launchpad/bug-553077 into lp:launchpad

Proposed by Jeroen T. Vermeulen on 2010-04-01
Status: Merged
Approved by: Jelmer Vernooij on 2010-04-01
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jtv/launchpad/bug-553077
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/canonical/buildd/debian/control (+1/-1)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-553077
Reviewer Review Type Date Requested Status
Michael Nelson (community) code 2010-04-01 Approve on 2010-04-01
Jelmer Vernooij (community) code* 2010-04-01 Approve on 2010-04-01
Review via email: mp+22599@code.launchpad.net

Commit Message

Tighten launchpad-buildd dependencies; avoid depending on universe.

Description of the Change

= Bug 553077 =

It'd be nice to get this reviewed today, 2010-04-01; PQM is closed but there's a launchpad-buildd coming up that doesn't require this to be in devel.

The launchpad-buildd package, which we install on the virtualized build slaves, depended on python-twisted. The dependencies behind that were extended recently to include, through python-twisted-conch, the package python-pyasn1. This package is in universe, but apt on the slaves is only set up for packages from main.

Luckily there is no need to pull in the entire python-twisted metapackage (thanks wgrant for pointing this out). Just python-twisted-core and python-twisted-web turned out to be enough.

We grep'ed for any imports from twisted in the code. These were the modules in actual use:

  twisted.application
  twisted.internet
  twisted.python
  twisted.web

Of these, twisted.web is the only one that isn't in core. So in this branch I replace the python-twisted dependency with python-twisted-core plus python-twisted-web. There's also an import of twisted.mail.smtp, but that's in a file that is no longer in use. William has a cleanup campaign planned.

I can't think of a way to test this in the automated test suite, but following the steps at https://dev.launchpad.net/BuildFarm/TryOutBuildSlave should give a pretty good idea. It WFM.

Jeroen

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

Thanks, less dependencies ftw.

It would also be nice to clean up some of the warnings in the package (using an old policy version, old (deprecated) debhelper etc) at some point.

I'm curious, is there any reason for the buildd slave code being inside of the main tree ? It seems like it could easily be moved into its own independent (more manageable) branch.

review: Approve (code*)
Michael Nelson (michael.nelson) wrote :

> Thanks, less dependencies ftw.
>
> It would also be nice to clean up some of the warnings in the package (using
> an old policy version, old (deprecated) debhelper etc) at some point.
>
> I'm curious, is there any reason for the buildd slave code being inside of the
> main tree ? It seems like it could easily be moved into its own independent
> (more manageable) branch.

That's bug 547036. Thanks Jelmer and Jeroen.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/buildd/debian/control'
2--- lib/canonical/buildd/debian/control 2009-11-17 22:28:43 +0000
3+++ lib/canonical/buildd/debian/control 2010-04-05 05:11:24 +0000
4@@ -8,7 +8,7 @@
5 Package: launchpad-buildd
6 Section: misc
7 Architecture: all
8-Depends: python-twisted, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https
9+Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https
10 Description: Launchpad buildd slave
11 This is the launchpad buildd slave package. It contains everything needed to
12 get a launchpad buildd going apart from the database manipulation required to