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
1=== modified file 'debian/changelog'
2--- debian/changelog 2020-01-06 15:03:55 +0000
3+++ debian/changelog 2020-03-16 11:48:59 +0000
4@@ -1,3 +1,10 @@
5+launchpad-buildd (187) UNRELEASED; urgency=medium
6+
7+ * Make lpbuildd.snap 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> Mon, 16 Mar 2020 11:45:28 +0000
11+
12 launchpad-buildd (186) xenial; urgency=medium
13
14 * Fix sbuildrc compatibility with xenial's sbuild.
15
16=== modified file 'lpbuildd/snap.py'
17--- lpbuildd/snap.py 2019-10-30 12:31:53 +0000
18+++ lpbuildd/snap.py 2020-03-16 11:48:59 +0000
19@@ -275,7 +275,8 @@
20 return []
21 proxy_port = self._builder._config.get("snapmanager", "proxyport")
22 proxy_factory = SnapProxyFactory(self, self.proxy_url, timeout=60)
23- self.proxy_service = strports.service(proxy_port, proxy_factory)
24+ self.proxy_service = strports.service(
25+ "tcp:%s" % proxy_port, proxy_factory)
26 self.proxy_service.setServiceParent(self._builder.service)
27 if self.backend_name == "lxd":
28 proxy_host = self.backend.ipv4_network.ip

Subscribers

People subscribed via source and target branches

to all changes: