Merge branch 'fixes/subprocess' of https://github.com/ferringb/ansible into ferringb-fixes/subprocess

2013-09-30 23:30:43 -05:00 · 2013-09-30 23:30:43 -05:00 · 5b205ae8bd
commit 5b205ae8bd
parent d89ce6ac61 2174230315
1 changed files with 2 additions and 3 deletions
--- a/lib/ansible/module_common.py
+++ b/lib/ansible/module_common.py
@ -935,10 +935,9 @@ class AnsibleModule(object):
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)
            if data:
-                cmd.stdin.write(data)
                if not binary_data:
-                    cmd.stdin.write('\\n')
-            out, err = cmd.communicate()
+                    data += '\\n'
+            out, err = cmd.communicate(input=data)
            rc = cmd.returncode
        except (OSError, IOError), e:
            self.fail_json(rc=e.errno, msg=str(e), cmd=args)