mirror of https://github.com/docker/docker-py.git
Merge 719e040075 into 03e43be6af
This commit is contained in:
commit
16b2a17240
|
|
@ -400,13 +400,14 @@ class ImageCollection(Collection):
|
||||||
images = []
|
images = []
|
||||||
for chunk in resp:
|
for chunk in resp:
|
||||||
if 'stream' in chunk:
|
if 'stream' in chunk:
|
||||||
match = re.search(
|
images.extend(
|
||||||
r'(^Loaded image ID: |^Loaded image: )(.+)$',
|
match.group(2)
|
||||||
chunk['stream']
|
for match in re.finditer(
|
||||||
|
r'(^Loaded image ID: |^Loaded image: )(.+)$',
|
||||||
|
chunk['stream'],
|
||||||
|
re.M
|
||||||
|
)
|
||||||
)
|
)
|
||||||
if match:
|
|
||||||
image_id = match.group(2)
|
|
||||||
images.append(image_id)
|
|
||||||
if 'error' in chunk:
|
if 'error' in chunk:
|
||||||
raise ImageLoadError(chunk['error'])
|
raise ImageLoadError(chunk['error'])
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue