Citra-emu/bleeding-edge-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a copy paste error

Browse Source
This commit is contained in:
James Rowe 2016-10-06 20:15:59 -06:00
parent 83a788e3fc
commit 85542e8494
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tag_build.py
View File

@ -111,7 +111,7 @@ class TagMergeBot:
retval, _ = _git("merge", pr["ref"], cwd=self.tracking_path) retval, _ = _git("merge", pr["ref"], cwd=self.tracking_path)
if retval != 0: if retval != 0:
_git("merge", "--abort", cwd=self.tracking_path) _git("merge", "--abort", cwd=self.tracking_path)
logger.warn("Branch ({0}, {1}) failed to merge.".format(pr["ref"], pr["id"])) logger.warn("Branch ({0}, {1}) failed to merge.".format(pr["ref"], pr["number"]))
total_failed += 1 total_failed += 1
return total_failed return total_failed