turnip

Merge ~cjwatson/turnip:http-translatePath-new-style into turnip:master

  1. Git
  2. lp:~cjwatson/turnip
  3. http-translatePath-new-style
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: cec345e25e9434a519834fb22682b6ba1c63ef5c
Merged at revision: 86162b717d95f4466a394f5f99775b0c38e0f95a
Proposed branch: ~cjwatson/turnip:http-translatePath-new-style
Merge into: turnip:master
Diff against target: 14 lines (+2/-1)
1 file modified
turnip/pack/http.py (+2/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+308574@code.launchpad.net

Commit message

Fix translatePath call for cgit requests

When I rearranged the way authentication parameters are passed, I forgot
to also update HTTPAuthRootResource.render_GET to use the new
translatePath signature.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Trivial fix to stop qastaging from OOPSing and unblock the next set of LP commits from deployment.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/turnip/pack/http.py b/turnip/pack/http.py
2index d0e8967..ada6b5f 100644
3--- a/turnip/pack/http.py
4+++ b/turnip/pack/http.py
5@@ -638,7 +638,8 @@ class HTTPAuthRootResource(BaseHTTPAuthResource):
6 identity_url = session.get('identity_url', self.anonymous_id)
7 proxy = xmlrpc.Proxy(self.root.virtinfo_endpoint, allowNone=True)
8 d = proxy.callRemote(
9- b'translatePath', request.path, b'read', identity_url, True)
10+ b'translatePath', request.path, b'read',
11+ {'uid': identity_url, 'can-authenticate': True})
12 d.addCallback(self._translatePathCallback, request)
13 d.addErrback(self._translatePathErrback, request, session)
14 return server.NOT_DONE_YET

Subscribers

People subscribed via source and target branches