launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/twisted-17.1.0-compat into lp:launchpad-buildd.

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/twisted-17.1.0-compat/+merge/340019
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/twisted-17.1.0-compat into lp:launchpad-buildd.

=== modified file 'debian/changelog'
--- debian/changelog	2018-01-15 10:08:55 +0000
+++ debian/changelog	2018-02-27 13:48:11 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (159) UNRELEASED; urgency=medium
+
+  * Make buildd-slave.tac compatible with Twisted >= 17.1.0, which drops
+    support for passing an unqualified port to strports.service.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Tue, 27 Feb 2018 13:22:20 +0000
+
 launchpad-buildd (158) xenial; urgency=medium
 
   [ Steve Langasek ]

=== modified file 'lpbuildd/buildd-slave.tac'
--- lpbuildd/buildd-slave.tac	2017-11-22 15:25:33 +0000
+++ lpbuildd/buildd-slave.tac	2018-02-27 13:48:11 +0000
@@ -57,7 +57,7 @@
 root.putChild('filecache', static.File(conf.get('slave', 'filecache')))
 slavesite = server.Site(root)
 
-strports.service(slave.slave._config.get("slave", "bindport"),
+strports.service("tcp:%s" % slave.slave._config.get("slave", "bindport"),
                  slavesite).setServiceParent(builddslaveService)
 
 # You can interact with a running slave like this: