more work on trivia

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 75361980609624a0a162c85b8a882896bd74b144..e516464355c51446baac414e5124bf7e41dabfc6 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -18,6 +18,7 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
 
 @lib.hook('eval', needchan=False, glevel=lib.MANAGER)
 @lib.argsGE(1)
@@ -26,6 +27,7 @@ def cmd_eval(bot, user, chan, realtarget, *args):
        else: replyto = user
 
        try: ret = eval(' '.join(args))
+       except SystemExit: raise
        except: bot.msg(replyto, "Error (%s): %s" % (sys.exc_info()[0], sys.exc_info()[1]))
        else: bot.msg(replyto, "Done: %r" % (ret))
 
@@ -37,5 +39,6 @@ def cmd_exec(bot, user, chan, realtarget, *args):
        else: replyto = user
 
        try: exec ' '.join(args)
+       except SystemExit: raise
        except: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
        else: bot.msg(replyto, "Done.")