From 1c4738bfdccdf4e604be3bc8ca56ddd6a6bb0aa5 Mon Sep 17 00:00:00 2001 From: James Vega Date: Mon, 18 May 2009 03:26:57 -0400 Subject: [PATCH] supybot-wizard: Fix listing of plugins during setup. Due to the changes to prevent the global plugins dir from being set in supybot.directories.plugins, the global plugins weren't being found. Simply extend the list of directories with the global directory. Signed-off-by: James Vega --- scripts/supybot-wizard | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 521714617..f23bf6294 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -55,6 +55,7 @@ import optparse import supybot.ansi as ansi import supybot.utils as utils +import supybot.plugin as plugin import supybot.ircutils as ircutils import supybot.registry as registry @@ -254,7 +255,7 @@ def main(): somewhere else.""") pluginDirs = conf.supybot.directories.plugins() output("""Currently, the bot knows about the following directories:""") - output(format('%L', pluginDirs)) + output(format('%L', pluginDirs + [plugin._pluginsDir])) while yn('Would you like to add another plugin directory? ' 'Adding a local plugin directory is good style.', default=True): @@ -451,7 +452,7 @@ def main(): else: conf.registerPlugin(module.__name__, currentValue=True) - plugins = getPlugins(pluginDirs) + plugins = getPlugins(pluginDirs + [plugin._pluginsDir]) for s in ('Admin', 'User', 'Channel', 'Misc', 'Config'): m = loadPlugin(s) if m is not None: