summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoost Cassee <joost@cassee.net>2014-04-30 21:46:37 +0200
committerJoost Cassee <joost@cassee.net>2014-04-30 21:46:37 +0200
commit978e6d2cd6bd8e56d14a23ec2005ab342c81a450 (patch)
tree4e66a729334ba85861ce6cc071a3fc2a1d495e7c
parentf8ca24b0469f14b1f71f956a2733fc8b4c889e77 (diff)
downloadansible-978e6d2cd6bd8e56d14a23ec2005ab342c81a450.tar.gz
Make concatenating certs robust in urls.py
Add a newline after each certificate file explicitly to avoid problems with files that do not end with a newline themselves.
-rw-r--r--lib/ansible/module_utils/urls.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py
index 2e6808b4e6..d80ea76bf8 100644
--- 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