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

Fix order of loading of modules.

Browse source 
Allows ANSIBLE_LIBRARY to overload core modules even if the module in
ANSIBLE_LIBRARY doesn't have a .py extension.

Equivalent of devel commit: 4b895f04e3
This commit is contained in:
Toshio Kuratomi 2015-09-09 15:03:49 -07:00
parent d3dca5606c
commit c0f416b510
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,12 +165,12 @@ class PluginLoader(object):
else: else:
suffixes = ['.py', ''] suffixes = ['.py', '']
potential_names = frozenset('%s%s' % (name, s) for s in suffixes) try:
for full_name in potential_names: return self._plugin_path_cache[name]
if full_name in self._plugin_path_cache: except KeyError:
return self._plugin_path_cache[full_name] # Cache miss. Now let's find the the plugin
pass
found = None
for path in [p for p in self._get_paths() if p not in self._searched_paths]: for path in [p for p in self._get_paths() if p not in self._searched_paths]:
if os.path.isdir(path): if os.path.isdir(path):
full_paths = (os.path.join(path, f) for f in os.listdir(path)) full_paths = (os.path.join(path, f) for f in os.listdir(path))
@ -178,21 +178,29 @@ class PluginLoader(object):
for suffix in suffixes: for suffix in suffixes:
if full_path.endswith(suffix): if full_path.endswith(suffix):
full_name = os.path.basename(full_path) full_name = os.path.basename(full_path)
if suffix:
base_name = full_name[:-len(suffix)]
else:
base_name = full_name
break break
else: # Yes, this is a for-else: http://bit.ly/1ElPkyg else: # Yes, this is a for-else: http://bit.ly/1ElPkyg
continue continue
if full_name not in self._plugin_path_cache: # Module found, now see if it's already in the cache
self._plugin_path_cache[full_name] = full_path if base_name not in self._plugin_path_cache:
self._plugin_path_cache[base_name] = full_path
self._searched_paths.add(path) self._searched_paths.add(path)
for full_name in potential_names: try:
if full_name in self._plugin_path_cache: return self._plugin_path_cache[name]
return self._plugin_path_cache[full_name] except KeyError:
# Didn't find the plugin in this directory. Load modules from
# the next one
pass
# if nothing is found, try finding alias/deprecated # if nothing is found, try finding alias/deprecated
if not name.startswith('_'): if not name.startswith('_'):
for alias_name in ('_%s' % n for n in potential_names): alias_name = '_' + name
# We've already cached all the paths at this point # We've already cached all the paths at this point
if alias_name in self._plugin_path_cache: if alias_name in self._plugin_path_cache:
return self._plugin_path_cache[alias_name] return self._plugin_path_cache[alias_name]