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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 412
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~cjwatson/launchpad-buildd/more-twisted-17.1.0-compat
Merge into: lp:launchpad-buildd
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
lpbuildd/snap.py (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/more-twisted-17.1.0-compat
Reviewer Review Type Date Requested Status
Ioana Lasc Approve
Review via email: mp+380721@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1launchpad-buildd (187) UNRELEASED; urgency=medium
2
3 * Make lpbuildd.snap compatible with Twisted >= 17.1.0, which drops
4 support for passing an unqualified port to strports.service.
5
6 -- Colin Watson <cjwatson@ubuntu.com> Mon, 16 Mar 2020 11:45:28 +0000
7
1launchpad-buildd (186) xenial; urgency=medium8launchpad-buildd (186) xenial; urgency=medium
29
3 * Fix sbuildrc compatibility with xenial's sbuild.10 * Fix sbuildrc compatibility with xenial's sbuild.
411
=== 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 @@
275 return []275 return []
276 proxy_port = self._builder._config.get("snapmanager", "proxyport")276 proxy_port = self._builder._config.get("snapmanager", "proxyport")
277 proxy_factory = SnapProxyFactory(self, self.proxy_url, timeout=60)277 proxy_factory = SnapProxyFactory(self, self.proxy_url, timeout=60)
278 self.proxy_service = strports.service(proxy_port, proxy_factory)278 self.proxy_service = strports.service(
279 "tcp:%s" % proxy_port, proxy_factory)
279 self.proxy_service.setServiceParent(self._builder.service)280 self.proxy_service.setServiceParent(self._builder.service)
280 if self.backend_name == "lxd":281 if self.backend_name == "lxd":
281 proxy_host = self.backend.ipv4_network.ip282 proxy_host = self.backend.ipv4_network.ip

Subscribers

People subscribed via source and target branches

to all changes: