From 345f819e7a4a7be4c59e489d7a070c76ad7e8240 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Mon, 19 May 2003 13:47:19 +0000 Subject: [PATCH] Changed reload to not unload the module if there's an error in loading. --- src/privmsgs.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/privmsgs.py b/src/privmsgs.py index 29bfb69f8..ad96c0592 100644 --- a/src/privmsgs.py +++ b/src/privmsgs.py @@ -279,17 +279,18 @@ class OwnerCommands(CapabilityCheckingPrivmsg): name = getArgs(args) callbacks = irc.removeCallback(name) if callbacks: - for callback in callbacks: - callback.die() try: moduleInfo = imp.find_module(name) + module = imp.load_module(name, *moduleInfo) + callback = module.Class() + irc.addCallback(callback) + for callback in callbacks: + callback.die() + irc.reply(msg, conf.replySuccess) except ImportError: + for callback in callbacks: + irc.addCallback(callback) irc.error(msg, 'No plugin %s exists.' % name) - return - module = imp.load_module(name, *moduleInfo) - callback = module.Class() - irc.addCallback(callback) - irc.reply(msg, conf.replySuccess) else: irc.error(msg, 'There was no callback %s.' % name)