diff --git a/src/Owner.py b/src/Owner.py index c84a94f15..d8569d89f 100644 --- a/src/Owner.py +++ b/src/Owner.py @@ -295,9 +295,9 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): def do001(self, irc, msg): self.log.info('Loading plugins.') - alwaysLoadSrcPlugins = conf.supybot.plugins.alwaysLoadDefault() + alwaysLoadSrcPlugins = conf.supybot.plugins.alwaysLoadImportant() for (name, value) in conf.supybot.plugins.getValues(fullNames=False): - if name.lower() in ('owner', 'alwaysloaddefault'): + if name.lower() in ('owner', 'alwaysloadimportant'): continue if irc.getCallback(name) is None: load = value() @@ -305,7 +305,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg): if alwaysLoadSrcPlugins: s = '%s is configured not to be loaded, but is being '\ 'loaded anyway because ' \ - 'supybot.plugins.alwaysLoadDefault is True.' + 'supybot.plugins.alwaysLoadImportant is True.' self.log.warning(s, name) load = True if load: diff --git a/src/conf.py b/src/conf.py index 4d6e84e7b..365e97a71 100644 --- a/src/conf.py +++ b/src/conf.py @@ -713,13 +713,13 @@ registerGlobalValue(supybot.directories, 'plugins', [config supybot.directories.plugins], newPluginDirectory'.""")) registerGroup(supybot, 'plugins', orderAlphabetically=True) -registerGlobalValue(supybot.plugins, 'alwaysLoadDefault', +registerGlobalValue(supybot.plugins, 'alwaysLoadImportant', registry.Boolean(True, """Determines whether the bot will always load - the default plugins (Admin, Channel, Config, Misc, Owner, and User) - regardless of what their configured state is. Generally, if these - plugins are configured not to load, you didn't do it on purpose, and - you still want them to load. Users who don't want to load these plugins - are smart enough to change the value of this variable appropriately :)""")) + important plugins (Admin, Channel, Config, Misc, Owner, and User) + regardless of what their configured state is. Generally, if these plugins + are configured not to load, you didn't do it on purpose, and you still + want them to load. Users who don't want to load these plugins are smart + enough to change the value of this variable appropriately :)""")) ### # supybot.databases. For stuff relating to Supybot's databases (duh!)