Breezy

Merge lp:~jelmer/brz/fork-error-msg into lp:brz/3.1

  1. fork-error-msg
  2. Merge into 3.1
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/fork-error-msg
Merge into: lp:brz/3.1
Diff against target: 17 lines (+3/-3)
1 file modified
breezy/plugins/gitlab/hoster.py (+3/-3)
To merge this branch: bzr merge lp:~jelmer/brz/fork-error-msg
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+388101@code.launchpad.net

Commit message

Avoid use of reserved 'msg' argument for BrzError.

Description of the change

Avoid use of reserved 'msg' argument for BrzError.

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 2020-07-24 17:47:14 +0000
3+++ breezy/plugins/gitlab/hoster.py 2020-07-26 17:50:07 +0000
4@@ -102,10 +102,10 @@
5
6 class GitLabConflict(errors.BzrError):
7
8- _fmt = "Conflict during operation: %(msg)s"
9+ _fmt = "Conflict during operation: %(reason)s"
10
11- def __init__(self, msg):
12- errors.BzrError(self, msg=msg)
13+ def __init__(self, reason):
14+ errors.BzrError(self, reason=reason)
15
16
17 class ForkingDisabled(errors.BzrError):

Subscribers

People subscribed via source and target branches