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

Merge pull request #26170 from nmadhok/backport-cloud-fix-26163-2015.8

Browse Source 
[Backport] Make sure variable is a dictionary before popping something from it.
This commit is contained in:
Nicole Thomas 2015-08-10 10:25:03 -06:00
commit 151acabdca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud/__init__.py
View File

@ -2218,7 +2218,7 @@ def create_multiprocessing(parallel_data, queue=None):
)
return {parallel_data['name']: {'Error': str(exc)}}
if parallel_data['opts'].get('show_deploy_args', False) is False:
if parallel_data['opts'].get('show_deploy_args', False) is False and isinstance(output, dict):
output.pop('deploy_kwargs', None)
return {