This commit is contained in:
Jeremy Fincher 2004-10-22 20:14:43 +00:00
parent 410569708c
commit 61d0b671d7

View File

@ -237,6 +237,8 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
self.log.error('Could not connect to %s: %s.', network, e) self.log.error('Could not connect to %s: %s.', network, e)
# Setup plugins and default plugins for commands. # Setup plugins and default plugins for commands.
for (name, s) in registry._cache.iteritems(): for (name, s) in registry._cache.iteritems():
if 'alwaysLoadDefault' in name or 'alwaysLoadImportant' in name:
continue
if name.startswith('supybot.plugins'): if name.startswith('supybot.plugins'):
try: try:
(_, _, name) = registry.split(name) (_, _, name) = registry.split(name)
@ -298,10 +300,10 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
self.log.info('Loading plugins.') self.log.info('Loading plugins.')
alwaysLoadSrcPlugins = conf.supybot.plugins.alwaysLoadImportant() alwaysLoadSrcPlugins = conf.supybot.plugins.alwaysLoadImportant()
for (name, value) in conf.supybot.plugins.getValues(fullNames=False): for (name, value) in conf.supybot.plugins.getValues(fullNames=False):
if name.lower() in ('owner', 'alwaysloadimportant'):
continue
if irc.getCallback(name) is None: if irc.getCallback(name) is None:
load = value() load = value()
# XXX This (_srcPlugins) should be changed to the configurable
# importantPlugins.
if not load and name in self._srcPlugins: if not load and name in self._srcPlugins:
if alwaysLoadSrcPlugins: if alwaysLoadSrcPlugins:
s = '%s is configured not to be loaded, but is being '\ s = '%s is configured not to be loaded, but is being '\