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

Fixes to !fpull

Browse Source
This commit is contained in:
nyuszika7h 2014-04-30 18:54:24 +02:00
parent 25d80216a8
commit 7d1d68f2b8
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/wolfgame.py
View File

@ -3113,13 +3113,23 @@ def player_stats_pm(cli, nick, rest):
def fpull(cli, nick, chan, rest): def fpull(cli, nick, chan, rest):
try: try:
output = subprocess.check_output(('git', 'pull', '-q'), stderr=subprocess.STDOUT) output = subprocess.check_output(('git', 'pull', '-q'), stderr=subprocess.STDOUT)
except Exception as e: except subprocess.CalledProcessError as e:
if chan == nick:
pm(cli, nick, '{0}: {1}'.format(type(e), e))
else:
cli.msg(chan, '{0}: {1}'.format(type(e), e)) cli.msg(chan, '{0}: {1}'.format(type(e), e))
#raise #raise
if output: if output:
for line in output.splitlines(): for line in output.splitlines():
if chan == nick:
pm(cli, nick, line.decode('utf-8'))
else:
cli.msg(chan, line.decode('utf-8')) cli.msg(chan, line.decode('utf-8'))
else:
if chan == nick:
pm(cli, nick, '(no output)')
else:
cli.msg(chan, '(no output)')
@pmcmd("fpull", admin_only=True) @pmcmd("fpull", admin_only=True)
def fpull_pm(cli, nick, rest): def fpull_pm(cli, nick, rest):