valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue where virtual modules with the same name as the module

Browse Source 
Were not being loaded
This commit is contained in:
Thomas S Hatch 2012-12-10 17:19:47 -07:00
parent 9564ac1629
commit 9dbd90a3e6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/loader.py
View File

@ -579,9 +579,7 @@ class Loader(object):
if hasattr(mod, '__virtual__'):
if callable(mod.__virtual__):
virtual = mod.__virtual__()
if virtual and module_name != virtual:
log.debug(('Loaded {0} as virtual '
'{1}').format(module_name, virtual))
if virtual:
# update the module name with the new name
module_name = virtual
else: