saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #38601 from terminalmage/pillar-get

Browse source 
pillar.get: Raise exception when merge=True and default is not a dict
This commit is contained in:
Mike Place 2017-01-05 16:15:50 -07:00 • committed by GitHub
commit da676cebd6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/pillar.py
View file

@ -16,7 +16,7 @@ import salt.ext.six as six
import salt.pillar
import salt.utils
from salt.defaults import DEFAULT_TARGET_DELIM
from salt.exceptions import CommandExecutionError
from salt.exceptions import CommandExecutionError, SaltInvocationError
__proxyenabled__ = ['*']
@ -87,6 +87,10 @@ def get(key,
pillar_dict = __pillar__ if saltenv is None else items(saltenv=saltenv)
if merge:
if not isinstance(default, dict):
raise SaltInvocationError(
'default must be a dictionary when merge=True'
)
ret = salt.utils.traverse_dict_and_list(pillar_dict, key, {}, delimiter)
if isinstance(ret, collections.Mapping) and \
isinstance(default, collections.Mapping):