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

Protect against TypeError is listeners is None

Browse source
This commit is contained in:
rallytime 2015-10-06 10:01:26 -06:00
parent 8ab7230535
commit 249f02c2bb
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/boto_elb.py
View file

@ -200,8 +200,12 @@ def create(name, availability_zones, listeners=None, subnets=None,
return True
if isinstance(availability_zones, string_types):
availability_zones = json.loads(availability_zones)
if isinstance(listeners, string_types):
if listeners is None:
listeners = []
elif isinstance(listeners, string_types):
listeners = json.loads(listeners)
_complex_listeners = []
for listener in listeners:
_complex_listeners.append(_listener_dict_to_tuple(listener))
@ -262,8 +266,11 @@ def create_listeners(name, listeners=None, region=None, key=None, keyid=None,
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
if isinstance(listeners, string_types):
if listeners is None:
listeners = []
elif isinstance(listeners, string_types):
listeners = json.loads(listeners)
_complex_listeners = []
for listener in listeners:
_complex_listeners.append(_listener_dict_to_tuple(listener))