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 #26172 from nmadhok/backport-cloud-fix-26163-2015.5

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:42:50 -06:00
commit ef5a4a47f6
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

@ -2104,7 +2104,7 @@ class Map(Cloud):
output[name] = self.create(
profile, local_master=local_master
)
if self.opts.get('show_deploy_args', False) is False:
if self.opts.get('show_deploy_args', False) is False and isinstance(output[name], dict):
output[name].pop('deploy_kwargs', None)
except SaltCloudException as exc:
log.error(