From f5391cab11063c1b23706d9f2c11fcfcc311ea49 Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Thu, 28 May 2015 09:42:41 -0400
Subject: [PATCH] Fix an issue where passing an empty yaml file (or ---) would
 cause an error if including a port specifier on a hostname

---
 awx/api/serializers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 282adee5e7..91dc192d77 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -947,6 +947,8 @@ class HostSerializer(BaseSerializerWithVariables):
             except (ValueError, TypeError):
                 try:
                     vars_dict = yaml.safe_load(variables)
+                    if vars_dict is None:
+                        vars_dict = {}
                     vars_dict['ansible_ssh_port'] = port
                     attrs['variables'] = yaml.dump(vars_dict)
                 except (yaml.YAMLError, TypeError):