Launchpad itself

Merge ~cjwatson/launchpad:py3-builder-download-file into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-builder-download-file
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 27e9a72bf88ecdf215a9d73155fc52ca481f754a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-builder-download-file
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/buildmaster/interactor.py (+1/-1)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+398697@code.launchpad.net

Commit message

Fix downloading files from builders on Python 3

Description of the change

DownloadCommand expects the URL as text, so send it as such.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/buildmaster/interactor.py b/lib/lp/buildmaster/interactor.py
2index c0afe10..b786a6d 100644
3--- a/lib/lp/buildmaster/interactor.py
4+++ b/lib/lp/buildmaster/interactor.py
5@@ -222,7 +222,7 @@ class BuilderSlave(object):
6
7 def getURL(self, sha1):
8 """Get the URL for a file on the builder with a given SHA-1."""
9- return urlappend(self._file_cache_url, sha1).encode('utf8')
10+ return urlappend(self._file_cache_url, sha1)
11
12 @defer.inlineCallbacks
13 def getFile(self, sha_sum, path_to_write, logger=None):

Subscribers

People subscribed via source and target branches

to status/vote changes: