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

Small fix for fpull. Removed freload.

Browse Source
This commit is contained in:
Yizhe Shen 2014-04-30 14:21:43 -04:00
parent 05d767db52
commit 1cdf586b2a
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/wolfgame.py
View File

@ -3111,11 +3111,13 @@ def player_stats_pm(cli, nick, rest):
@cmd("fpull", admin_only=True) @cmd("fpull", admin_only=True)
def fpull(cli, nick, chan, rest): def fpull(cli, nick, chan, rest):
output = None
try: try:
output = subprocess.check_output(('git', 'pull'), stderr=subprocess.STDOUT) output = subprocess.check_output(('git', 'pull'), stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
pm(cli, nick, '{0}: {1}'.format(type(e), e)) pm(cli, nick, '{0}: {1}'.format(type(e), e))
#raise #raise
if output: if output:
for line in output.splitlines(): for line in output.splitlines():
pm(cli, nick, line.decode('utf-8')) pm(cli, nick, line.decode('utf-8'))
@ -3124,36 +3126,13 @@ def fpull(cli, nick, chan, rest):
@pmcmd("fpull", admin_only=True) @pmcmd("fpull", admin_only=True)
def fpull_pm(cli, nick, rest): def fpull_pm(cli, nick, rest):
git_pull(cli, nick, nick, rest) fpull(cli, nick, nick, rest)
@pmcmd("fsend", admin_only=True) @pmcmd("fsend", admin_only=True)
def fsend(cli, nick, rest): def fsend(cli, nick, rest):
print('fsend ({0}): {1}'.format(nick, rest)) print('fsend ({0}): {1}'.format(nick, rest))
cli.send(rest) cli.send(rest)
@cmd("freload", "frehash", admin_only=True)
def freload(cli, nick, chan, rest):
try:
# No, this doesn't clear the stasis list.
reload(var)
reload(botconfig)
except ImportError:
if chan == nick:
pm(cli, nick, '{0}: {1}'.format(type(e), e))
else:
cli.msg(chan, '{0}: {1}'.format(type(e), e))
raise
else:
if chan == nick:
pm(cli, nick, '{0}: {1}'.format(type(e), e))
else:
cli.msg(chan, 'Reloaded config.')
@pmcmd("freload", "frehash", admin_only=True)
def freload_pm(cli, nick, rest):
freload(cli, nick, nick, rest)
before_debug_mode_commands = list(COMMANDS.keys()) before_debug_mode_commands = list(COMMANDS.keys())
before_debug_mode_pmcommands = list(PM_COMMANDS.keys()) before_debug_mode_pmcommands = list(PM_COMMANDS.keys())