From 066a360a36b43f2ecfbe16fc742d311d6dc20e98 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Tue, 25 Oct 2016 08:20:35 -0700 Subject: [PATCH] backport various docker_common fixes from devel (cherry picked from commit b5c95ea6fa4b2fa1f27a9c4d87d093366ba7ea3c) --- lib/ansible/module_utils/docker_common.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py index 9a54be64d50..f36110a39d8 100644 --- a/lib/ansible/module_utils/docker_common.py +++ b/lib/ansible/module_utils/docker_common.py @@ -446,8 +446,7 @@ class AnsibleDockerClient(Client): ''' self.log("Pulling image %s:%s" % (name, tag)) try: - for line in self.pull(name, tag=tag, stream=True): - line = json.loads(line) + for line in self.pull(name, tag=tag, stream=True, decode=True): self.log(line, pretty_print=True) if line.get('error'): if line.get('errorDetail'):