Made local plugins to be ordered before global plugins.

This commit is contained in:
Jeremy Fincher 2003-10-23 03:26:36 +00:00
parent 8a378601b3
commit e255ef2e68
2 changed files with 4 additions and 2 deletions

View File

@ -220,12 +220,12 @@ def main():
press enter and we'll put a "plugins" directory right here that you can press enter and we'll put a "plugins" directory right here that you can
stick your own personal plugins in.""") stick your own personal plugins in.""")
pluginDir = getDirectoryName('plugins') pluginDir = getDirectoryName('plugins')
conf.pluginDirs.append(pluginDir) conf.pluginDirs.insert(0, pluginDir)
myPrint("""Of course, you can have more than one plugin directory.""") myPrint("""Of course, you can have more than one plugin directory.""")
while yn('Would you like to add another plugin directory?') == 'y': while yn('Would you like to add another plugin directory?') == 'y':
pluginDir = getDirectoryName('plugins') pluginDir = getDirectoryName('plugins')
if pluginDir != 'plugins' and pluginDir not in conf.pluginDirs: if pluginDir != 'plugins' and pluginDir not in conf.pluginDirs:
conf.pluginDirs.append(pluginDir) conf.pluginDirs.insert(0, pluginDir)
configVariables['pluginDirs'] = conf.pluginDirs configVariables['pluginDirs'] = conf.pluginDirs
### ###

View File

@ -386,7 +386,9 @@ if __name__ == '__main__':
PluginTestCase.timeout = options.timeout PluginTestCase.timeout = options.timeout
if options.plugindirs: if options.plugindirs:
options.plugindirs.reverse()
conf.pluginDirs.extend(options.plugindirs) conf.pluginDirs.extend(options.plugindirs)
conf.pluginDirs.reverse()
if options.verbose: if options.verbose:
world.myVerbose = True world.myVerbose = True