cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Prefer categorized modules to uncategorized, such that if someone does an install on top of old content

Browse source 
the categorized modules will win over the 1.1 uncategorized modules, as the packages may not automatically
clean up the old content.
This commit is contained in:
Michael DeHaan 2013-05-19 20:09:44 -04:00
parent cd57d59913
commit 753ebea186
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/plugins.py
View file

@ -108,11 +108,11 @@ class PluginLoader(object):
# look in any configured plugin paths, allow one level deep for subcategories # look in any configured plugin paths, allow one level deep for subcategories
configured_paths = self.config.split(os.pathsep) configured_paths = self.config.split(os.pathsep)
for path in configured_paths: for path in configured_paths:
ret.append(path)
contents = glob.glob("%s/*" % path) contents = glob.glob("%s/*" % path)
for c in contents: for c in contents:
if os.path.isdir(c): if os.path.isdir(c):
ret.append(c) ret.append(c)
ret.append(path)
# look for any plugins installed in the package subtree # look for any plugins installed in the package subtree
ret.extend(self._get_package_paths()) ret.extend(self._get_package_paths())