Skip to content

Commit

Permalink
Merge pull request ansible#9368 from silvax/handle-return-non-on-join
Browse files Browse the repository at this point in the history
as I read it, the issue is with a None item in the list, not with an empty list (tests return empty string), still fixes a traceback
  • Loading branch information
bcoca committed Nov 13, 2014
2 parents 88d33a3 + 4755bde commit 517ae8b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugins/inventory/ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,8 @@ def get_host_info_dict_from_instance(self, instance):
for group in value:
group_ids.append(group.id)
group_names.append(group.name)
instance_vars["ec2_security_group_ids"] = ','.join(group_ids)
instance_vars["ec2_security_group_names"] = ','.join(group_names)
instance_vars["ec2_security_group_ids"] = ','.join([str(i) for i in group_ids])
instance_vars["ec2_security_group_names"] = ','.join([str(i) for i in group_names])
else:
pass
# TODO Product codes if someone finds them useful
Expand Down

0 comments on commit 517ae8b

Please sign in to comment.