Merge pull request #7236 from jcassee/robust-ssl-cert-concat

Make concatenating certs robust in urls.py
2014-04-30 15:48:13 -05:00 · 2014-04-30 15:48:13 -05:00 · 40a7a306f5
parent 8e45fa9b63 978e6d2cd6
commit 40a7a306f5
1 changed files with 1 additions and 0 deletions
--- a/lib/ansible/module_utils/urls.py
+++ b/lib/ansible/module_utils/urls.py
@ -154,6 +154,7 @@ class SSLValidationHandler(urllib2.BaseHandler):
                        try:
                            cert_file = open(full_path, 'r')
                            os.write(tmp_fd, cert_file.read())
+                            os.write(tmp_fd, '\n')
                            cert_file.close()
                        except:
                            pass