External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 06:29:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where passing an empty yaml file (or ---) would cause an

Browse Source 
error if including a port specifier on a hostname
This commit is contained in:
Matthew Jones
2015-05-28 09:42:41 -04:00
parent 58b3f4360c
commit f5391cab11
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -947,6 +947,8 @@ class HostSerializer(BaseSerializerWithVariables):
except (ValueError, TypeError): except (ValueError, TypeError):
try: try:
vars_dict = yaml.safe_load(variables) vars_dict = yaml.safe_load(variables)
if vars_dict is None:
vars_dict = {}
vars_dict['ansible_ssh_port'] = port vars_dict['ansible_ssh_port'] = port
attrs['variables'] = yaml.dump(vars_dict) attrs['variables'] = yaml.dump(vars_dict)
except (yaml.YAMLError, TypeError): except (yaml.YAMLError, TypeError):