From 474fff8e2bcd47f099b4dcd0165a14c01da167db Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Wed, 30 Apr 2014 19:31:55 +0200 Subject: [PATCH] Fix !fpull and make it always reply in PM/notice --- modules/wolfgame.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 0c5f7f2..919cc0e 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -3112,24 +3112,15 @@ def player_stats_pm(cli, nick, rest): @cmd("fpull", admin_only=True) def fpull(cli, nick, chan, rest): try: - output = subprocess.check_output(('git', 'pull', '--no-progress'), stderr=subprocess.STDOUT) + output = subprocess.check_output(('git', 'pull'), stderr=subprocess.STDOUT) 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)) + pm(cli, nick, '{0}: {1}'.format(type(e), e)) #raise if output: for line in output.splitlines(): - if chan == nick: - pm(cli, nick, line.decode('utf-8')) - else: - cli.msg(chan, line.decode('utf-8')) + pm(cli, nick, line.decode('utf-8')) else: - if chan == nick: - pm(cli, nick, '(no output)') - else: - cli.msg(chan, '(no output)') + pm(cli, nick, '(no output)') @pmcmd("fpull", admin_only=True) def fpull_pm(cli, nick, rest):