From 61d0b671d7386c8d75bdf7f04720a1c168cbf345 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Fri, 22 Oct 2004 20:14:43 +0000 Subject: [PATCH] Fixed bug #1051136. --- src/Owner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Owner.py b/src/Owner.py index a937f835f..fc4ab461b 100644 --- a/src/Owner.py +++ b/src/Owner.py @@ -237,6 +237,8 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): self.log.error('Could not connect to %s: %s.', network, e) # Setup plugins and default plugins for commands. for (name, s) in registry._cache.iteritems(): + if 'alwaysLoadDefault' in name or 'alwaysLoadImportant' in name: + continue if name.startswith('supybot.plugins'): try: (_, _, name) = registry.split(name) @@ -298,10 +300,10 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): self.log.info('Loading plugins.') alwaysLoadSrcPlugins = conf.supybot.plugins.alwaysLoadImportant() for (name, value) in conf.supybot.plugins.getValues(fullNames=False): - if name.lower() in ('owner', 'alwaysloadimportant'): - continue if irc.getCallback(name) is None: load = value() + # XXX This (_srcPlugins) should be changed to the configurable + # importantPlugins. if not load and name in self._srcPlugins: if alwaysLoadSrcPlugins: s = '%s is configured not to be loaded, but is being '\