From cc1bc400dda43db48d7af6b17ba082392c79ccbf Mon Sep 17 00:00:00 2001 From: Jordan Webb Date: Tue, 27 Aug 2019 11:25:10 -0500 Subject: [PATCH] [stable-2.8] Fix pipelining in buildah connection plugin --- .../59745-fix-pipelining-in-buildah-connection-plugin.yml | 2 ++ lib/ansible/plugins/connection/buildah.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/59745-fix-pipelining-in-buildah-connection-plugin.yml diff --git a/changelogs/fragments/59745-fix-pipelining-in-buildah-connection-plugin.yml b/changelogs/fragments/59745-fix-pipelining-in-buildah-connection-plugin.yml new file mode 100644 index 00000000000..edef4f318e2 --- /dev/null +++ b/changelogs/fragments/59745-fix-pipelining-in-buildah-connection-plugin.yml @@ -0,0 +1,2 @@ +bugfixes: +- Pipelining now works with the buildah plugin. diff --git a/lib/ansible/plugins/connection/buildah.py b/lib/ansible/plugins/connection/buildah.py index 470173be18f..bb04b224855 100644 --- a/lib/ansible/plugins/connection/buildah.py +++ b/lib/ansible/plugins/connection/buildah.py @@ -120,7 +120,7 @@ class Connection(ConnectionBase): # shlex.split has a bug with text strings on Python-2.6 and can only handle text strings on Python-3 cmd_args_list = shlex.split(to_native(cmd, errors='surrogate_or_strict')) - rc, stdout, stderr = self._buildah("run", cmd_args_list) + rc, stdout, stderr = self._buildah("run", cmd_args_list, in_data) display.vvvvv("STDOUT %r STDERR %r" % (stderr, stderr)) return rc, stdout, stderr