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

added deepcopy of default if merge=True

Browse source
This commit is contained in:
marco.messerschmidt 2017-01-05 12:16:57 +01:00 • committed by rallytime
parent da676cebd6
commit 30ae0a1958
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/modules/pillar.py
View file

@ -91,6 +91,7 @@ def get(key,
raise SaltInvocationError(
'default must be a dictionary when merge=True'
)
default = copy.deepcopy(default)
ret = salt.utils.traverse_dict_and_list(pillar_dict, key, {}, delimiter)
if isinstance(ret, collections.Mapping) and \
isinstance(default, collections.Mapping):