diff options
| author | Matt Davis <mdavis@ansible.com> | 2016-10-25 08:20:35 -0700 |
|---|---|---|
| committer | Matt Davis <mdavis@ansible.com> | 2016-10-25 17:34:56 -0700 |
| commit | 066a360a36b43f2ecfbe16fc742d311d6dc20e98 (patch) | |
| tree | 5f1989d67b32ef4fa2859c69082f0d328d8d15d1 | |
| parent | 731422a6dc12b9a88d114d9b6423377837f181f3 (diff) | |
| download | ansible-066a360a36b43f2ecfbe16fc742d311d6dc20e98.tar.gz | |
backport various docker_common fixes from devel
(cherry picked from commit b5c95ea6fa4b2fa1f27a9c4d87d093366ba7ea3c)
| -rw-r--r-- | lib/ansible/module_utils/docker_common.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py index 9a54be64d5..f36110a39d 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'): |