cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle ValueError during json.loads of json data from build

Browse source
This commit is contained in:
Matt Martz 2014-05-12 13:51:55 -05:00
parent d725636469
commit 92b77048dc
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/cloud/docker_image
View file

@ -140,7 +140,10 @@ class DockerImageManager:
if not chunk: if not chunk:
continue continue
chunk_json = json.loads(chunk) try:
chunk_json = json.loads(chunk)
except ValueError:
continue
if 'error' in chunk_json: if 'error' in chunk_json:
self.error_msg = chunk_json['error'] self.error_msg = chunk_json['error']
@ -153,6 +156,12 @@ class DockerImageManager:
if match: if match:
image_id = match.group(1) image_id = match.group(1)
# Just in case we skipped evaluating the JSON returned from build
# during every iteration, add an error if the image_id was never
# populated
if not image_id:
self.error_msg = 'Unknown error encountered'
return image_id return image_id
def has_changed(self): def has_changed(self):