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

fpull: Refactor code

Browse Source
This commit is contained in:
nyuszika7h 2014-11-26 14:23:41 +01:00
parent d9b89a5f95
commit 19809f4d70
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/wolfgame.py
View File

@ -5883,13 +5883,14 @@ def player_stats_pm(cli, nick, rest):
player_stats(cli, nick, nick, rest) player_stats(cli, nick, nick, rest)
@cmd('fpull', admin_only=True) @cmd("fpull", admin_only=True)
def fpull(cli, nick, chan, rest): def fpull(cli, nick, chan, rest):
"""Pulls from the repository to update the bot.""" """Pulls from the repository to update the bot."""
args = ['git', 'pull', '--rebase=preserve']
args = ["git", "pull", "--rebase=preserve"]
if rest: if rest:
args += rest.split(' ') args += rest.split(" ")
child = subprocess.Popen(args, child = subprocess.Popen(args,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
@ -5899,24 +5900,21 @@ def fpull(cli, nick, chan, rest):
for line in (out + err).splitlines(): for line in (out + err).splitlines():
if chan == nick: if chan == nick:
cli.msg(nick, line.decode('utf-8')) cli.msg(nick, line.decode("utf-8"))
else: else:
pm(cli, nick, line.decode('utf-8')) pm(cli, nick, line.decode("utf-8"))
if ret != 0: if ret != 0:
if ret < 0: if ret < 0:
cause = 'signal' cause = "signal"
ret *= -1
else: else:
cause = 'status' cause = "status"
if chan == nick: if chan == nick:
cli.msg(nick, 'Process {} exited with {} {}'.format(args, cli.msg(nick, "Process %s exited with %s %d" % (args, cause, ret))
cause,
abs(ret)))
else: else:
pm(cli, nick, 'Process {} exited with {} {}'.format(args, pm(cli, nick, "Process %s exited with %s %d" % (args, cause, ret))
cause,
abs(ret)))
@pmcmd('fpull', admin_only=True) @pmcmd('fpull', admin_only=True)