better handle appending \n on stderr

fixes #39007
2018-04-19 09:45:30 -04:00 · 2018-04-19 09:45:30 -04:00 · fe5e6d74af
commit fe5e6d74af
parent becc2a0347
1 changed files with 4 additions and 1 deletions
--- a/lib/ansible/plugins/inventory/script.py
+++ b/lib/ansible/plugins/inventory/script.py
@ -104,7 +104,10 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
                (stdout, stderr) = sp.communicate()

                path = to_native(path)
-                err = to_native(stderr or "") + "\n"
+                err = to_native(stderr or "")
+
+                if err and not err.endswith('\n'):
+                    err =+ '\n'

                if sp.returncode != 0:
                    raise AnsibleError("Inventory script (%s) had an execution error: %s " % (path, err))