Merge lp:~cjwatson/launchpad/restore-git-snap-build-macaroon into lp:launchpad
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 18964 |
Proposed branch: | lp:~cjwatson/launchpad/restore-git-snap-build-macaroon |
Merge into: | lp:launchpad |
Prerequisite: | lp:~cjwatson/launchpad/refactor-git-code-import-authz-2 |
Diff against target: |
274 lines (+145/-3) 5 files modified
lib/lp/code/model/tests/test_codeimportjob.py (+2/-0) lib/lp/code/xmlrpc/git.py (+16/-2) lib/lp/code/xmlrpc/tests/test_git.py (+89/-1) lib/lp/snappy/model/snapbuild.py (+5/-0) lib/lp/snappy/tests/test_snapbuild.py (+33/-0) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/restore-git-snap-build-macaroon |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+367204@code.launchpad.net |
Commit message
Make GitAPI accept snap-build macaroons again.
Description of the change
I added support for snap-build macaroons recently, and then promptly forgot about it when refactoring code import authorisation, largely because I hadn't explicitly written any tests for it.
In the process of writing these tests, I noticed that I really should have forced snap-build macaroons to be read-only, so I've done that. The mechanism for doing this is pretty ad-hoc, but we can always improve it later.
To post a comment you must log in.