Merge lp://staging/~newell-jensen/maas/fix-1628114 into lp://staging/~maas-committers/maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5471
Proposed branch: lp://staging/~newell-jensen/maas/fix-1628114
Merge into: lp://staging/~maas-committers/maas/trunk
Diff against target: 55 lines (+12/-6)
2 files modified
src/maasserver/utils/keys.py (+6/-2)
src/maasserver/utils/tests/test_keys.py (+6/-4)
To merge this branch: bzr merge lp://staging/~newell-jensen/maas/fix-1628114
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+308165@code.staging.launchpad.net

Commit message

Catch 410 errors explicitly when trying to import SSH keys, as the user doesn't exist if the page is gone.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Looks good, but I have one question.

review: Needs Information
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

I don't think he should handle all 400s the same

Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.