mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Handle ValueError during json.loads of json data from build
This commit is contained in:
parent
d725636469
commit
92b77048dc
1 changed files with 10 additions and 1 deletions
|
@ -140,7 +140,10 @@ class DockerImageManager:
|
||||||
if not chunk:
|
if not chunk:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
chunk_json = json.loads(chunk)
|
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):
|
||||||
|
|
Loading…
Reference in a new issue