Breezy

Merge lp:~jelmer/brz/gitlab-not-a-fork into lp:brz/3.2

  1. gitlab-not-a-fork
  2. Merge into 3.2
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/gitlab-not-a-fork
Merge into: lp:brz/3.2
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/plugins/gitlab/hoster.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/gitlab-not-a-fork
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+416623@code.launchpad.net

Commit message

Cope with alternate formatting of GitLab error JSON.

Description of the change

Cope with alternate formatting of GitLab error JSON.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/gitlab/hoster.py'
2--- breezy/plugins/gitlab/hoster.py 2022-02-28 22:48:07 +0000
3+++ breezy/plugins/gitlab/hoster.py 2022-03-09 21:09:17 +0000
4@@ -595,7 +595,7 @@
5 raise GitLabConflict(json.loads(response.data).get('message'))
6 if response.status == 422:
7 data = json.loads(response.data)
8- raise GitLabUnprocessable(data.get('error'), data)
9+ raise GitLabUnprocessable(data.get('error') or data.get('message'), data)
10 if response.status != 201:
11 _unexpected_status(path, response)
12 return json.loads(response.data)

Subscribers

People subscribed via source and target branches