From fb6473f0030dbfc66630cad19646e13b9f29f96c Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 12 May 2014 11:33:50 +0800 Subject: [PATCH] Resolve plugin path before subsystem --- lib/plugins.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/plugins.py b/lib/plugins.py index 77e1acc..6dbd874 100644 --- a/lib/plugins.py +++ b/lib/plugins.py @@ -210,12 +210,6 @@ class PluginManager(object): head = True tail = None while head and head != '/' and not pluginOrSubsystem: - # Check subsystems. - for k, v in cls._subSystems.iteritems(): - if v == candidate: - pluginOrSubsystem = k - break - # Check plugin types. if not pluginOrSubsystem: for k, v in cls._pluginTypesPath.iteritems(): @@ -231,6 +225,13 @@ class PluginManager(object): pluginOrSubsystem = k pluginName = tail break + + # Check subsystems. + for k, v in cls._subSystems.iteritems(): + if v == candidate: + pluginOrSubsystem = k + break + (head, tail) = os.path.split(candidate) candidate = head -- 2.11.0