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

Fix case where __virtulname__ falls back to True

Browse Source
This commit is contained in:
Mike Place 2014-09-15 15:27:49 -06:00
parent cf32d4e55b
commit 7577520ad8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/loader.py
View File

@ -1114,7 +1114,8 @@ class Loader(object):
# If the __virtual__ function returns True and __virtualname__ is set then use it # If the __virtual__ function returns True and __virtualname__ is set then use it
elif virtual is True and virtualname != module_name: elif virtual is True and virtualname != module_name:
module_name = getattr(mod, '__virtualname__', virtual) if virtualname is not True:
module_name = virtualname
except KeyError: except KeyError:
# Key errors come out of the virtual function when passing # Key errors come out of the virtual function when passing