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

[Colin Watson]

Make lpbuildd.snap compatible with Twisted >= 17.1.0, which drops support for passing an unqualified port to strports.service.

This is basically the same as https://code.launchpad.net/~cjwatson/launchpad-buildd/twisted-17.1.0-compat/+merge/340019. Oddly, I seem to have forgotten to grep for strports.service to find other similar problems when I was making that change.

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2020-01-06 15:03:55 +0000
+++ debian/changelog	2020-03-16 11:48:59 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (187) UNRELEASED; urgency=medium
+
+  * Make lpbuildd.snap compatible with Twisted >= 17.1.0, which drops
+    support for passing an unqualified port to strports.service.
+
+ -- Colin Watson <[e-mail]>  Mon, 16 Mar 2020 11:45:28 +0000
+
 launchpad-buildd (186) xenial; urgency=medium
 
   * Fix sbuildrc compatibility with xenial's sbuild.

=== modified file 'lpbuildd/snap.py'
--- lpbuildd/snap.py	2019-10-30 12:31:53 +0000
+++ lpbuildd/snap.py	2020-03-16 11:48:59 +0000
@@ -275,7 +275,8 @@
             return []
         proxy_port = self._builder._config.get("snapmanager", "proxyport")
         proxy_factory = SnapProxyFactory(self, self.proxy_url, timeout=60)
-        self.proxy_service = strports.service(proxy_port, proxy_factory)
+        self.proxy_service = strports.service(
+            "tcp:%s" % proxy_port, proxy_factory)
         self.proxy_service.setServiceParent(self._builder.service)
         if self.backend_name == "lxd":
             proxy_host = self.backend.ipv4_network.ip