Skip to content

Commit ee4fb87

Browse files
authored
Abort correctly by calling abort_cherry_pick() (GH-13)
1 parent 2c58f9b commit ee4fb87

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

backport/tasks.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ def backport_task(commit_hash, branch, *, issue_number, created_by, merged_by):
3939
util.comment_on_pr(issue_number,
4040
f"Sorry @{created_by} and @{merged_by}, I had trouble checking out the backport branch."
4141
"Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.")
42-
cp.abort()
42+
cp.abort_cherry_pick()
4343
except cherry_picker.CherryPickException:
4444
util.comment_on_pr(issue_number,
45-
f"Sorry, @{created_by} and @{merged_by}, I could not cleanly backport this PR due to a conflict."
46-
"Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.")
47-
cp.abort()
45+
f"""Sorry, @{created_by} and @{merged_by}, I could not cleanly backport this PR due to a conflict.
46+
Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.""")
47+
cp.abort_cherry_pick()

0 commit comments

Comments
 (0)