Merge pull request #6767 from mway/devel

don't parse empty stream chunks

Merge pull request #6767 from mway/devel
don't parse empty stream chunks
b489fbfb · Michael DeHaan · f96618c9 · 034ac93c · b489fbfb
Commit b489fbfb authored Mar 30, 2014 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

library/cloud/docker_image
+3 -0

No files found.
--- a/library/cloud/docker_image
+++ b/library/cloud/docker_image
@@ -137,6 +137,9 @@ class DockerImageManager:
        self.changed = True

        for chunk in stream:
+            if not chunk:
+                continue
+
            chunk_json = json.loads(chunk)

            if 'error' in chunk_json: