Merge pull request #6767 from mway/devel

don't parse empty stream chunks
This commit is contained in:
Michael DeHaan 2014-03-30 15:47:21 -04:00
commit b489fbfbf6

View file

@ -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: