From 753ebea186d93f5f26ec394bd6ec3fbdca43e2d5 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sun, 19 May 2013 20:09:44 -0400 Subject: [PATCH] Prefer categorized modules to uncategorized, such that if someone does an install on top of old content the categorized modules will win over the 1.1 uncategorized modules, as the packages may not automatically clean up the old content. --- lib/ansible/utils/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/utils/plugins.py b/lib/ansible/utils/plugins.py index 7e87fcba5da..c36e5434aeb 100644 --- a/lib/ansible/utils/plugins.py +++ b/lib/ansible/utils/plugins.py @@ -108,11 +108,11 @@ class PluginLoader(object): # look in any configured plugin paths, allow one level deep for subcategories configured_paths = self.config.split(os.pathsep) for path in configured_paths: - ret.append(path) contents = glob.glob("%s/*" % path) for c in contents: if os.path.isdir(c): ret.append(c) + ret.append(path) # look for any plugins installed in the package subtree ret.extend(self._get_package_paths())