Merge lp:~cjwatson/launchpad-buildd/twisted-17.1.0-compat into lp:launchpad-buildd

Proposed by Colin Watson
Status: Merged
Merged at revision: 329
Proposed branch: lp:~cjwatson/launchpad-buildd/twisted-17.1.0-compat
Merge into: lp:launchpad-buildd
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
lpbuildd/buildd-slave.tac (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/twisted-17.1.0-compat
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Launchpad code reviewers Pending
Review via email: mp+340019@code.launchpad.net

Commit message

Make buildd-slave.tac compatible with Twisted >= 17.1.0, which drops support for passing an unqualified port to strports.service.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-01-15 10:08:55 +0000
3+++ debian/changelog 2018-02-27 13:48:11 +0000
4@@ -1,3 +1,10 @@
5+launchpad-buildd (159) UNRELEASED; urgency=medium
6+
7+ * Make buildd-slave.tac compatible with Twisted >= 17.1.0, which drops
8+ support for passing an unqualified port to strports.service.
9+
10+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 27 Feb 2018 13:22:20 +0000
11+
12 launchpad-buildd (158) xenial; urgency=medium
13
14 [ Steve Langasek ]
15
16=== modified file 'lpbuildd/buildd-slave.tac'
17--- lpbuildd/buildd-slave.tac 2017-11-22 15:25:33 +0000
18+++ lpbuildd/buildd-slave.tac 2018-02-27 13:48:11 +0000
19@@ -57,7 +57,7 @@
20 root.putChild('filecache', static.File(conf.get('slave', 'filecache')))
21 slavesite = server.Site(root)
22
23-strports.service(slave.slave._config.get("slave", "bindport"),
24+strports.service("tcp:%s" % slave.slave._config.get("slave", "bindport"),
25 slavesite).setServiceParent(builddslaveService)
26
27 # You can interact with a running slave like this:

Subscribers

People subscribed via source and target branches

to all changes: