notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also abort if 'git status' fails

Browse Source
This commit is contained in:
nyuszika7h 2016-11-16 15:04:05 +01:00
parent 82d6760c5a
commit d62b9db896
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wolfgame.py
View File

@ -7241,11 +7241,12 @@ def fpull(cli, nick, chan, rest):
"""Pulls from the repository to update the bot.""" """Pulls from the repository to update the bot."""
(ret, _) = _call_command(cli, nick, chan, "git fetch") (ret, _) = _call_command(cli, nick, chan, "git fetch")
if ret != 0: if ret != 0:
return False return False
(_, out) = _call_command(cli, nick, chan, "git status -b --porcelain", no_out=True) (ret, out) = _call_command(cli, nick, chan, "git status -b --porcelain", no_out=True)
if ret != 0:
return False
if not re.search(rb"behind \d+", out.splitlines()[0]): if not re.search(rb"behind \d+", out.splitlines()[0]):
# Already up-to-date # Already up-to-date
@ -7253,7 +7254,6 @@ def fpull(cli, nick, chan, rest):
return False return False
(ret, _) = _call_command(cli, nick, chan, "git rebase --stat --preserve-merges") (ret, _) = _call_command(cli, nick, chan, "git rebase --stat --preserve-merges")
return (ret == 0) return (ret == 0)
@cmd("update", flag="D", pm=True) @cmd("update", flag="D", pm=True)