saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29597 from terminalmage/issue29584

Browse source 
dockerng: Prevent exception when API response contains empty dictionary
This commit is contained in:
Mike Place 2015-12-10 12:57:42 -07:00
commit b5b80b9324
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/dockerng.py
View file

@ -3430,7 +3430,10 @@ def build(path=None,
errors = []
# Iterate through API response and collect information
for item in stream_data:
item_type = next(iter(item))
try:
item_type = next(iter(item))
except StopIteration:
continue
if item_type == 'status':
_pull_status(ret, item)
if item_type == 'stream':
@ -3649,7 +3652,10 @@ def import_(source,
errors = []
# Iterate through API response and collect information
for item in response:
item_type = next(iter(item))
try:
item_type = next(iter(item))
except StopIteration:
continue
if item_type == 'status':
_import_status(ret, item, repo_name, repo_tag)
elif item_type == 'errorDetail':
@ -3859,7 +3865,10 @@ def pull(image,
errors = []
# Iterate through API response and collect information
for item in response:
item_type = next(iter(item))
try:
item_type = next(iter(item))
except StopIteration:
continue
if item_type == 'status':
_pull_status(ret, item)
elif item_type == 'errorDetail':
@ -3948,7 +3957,10 @@ def push(image,
errors = []
# Iterate through API response and collect information
for item in response:
item_type = next(iter(item))
try:
item_type = next(iter(item))
except StopIteration:
continue
if item_type == 'status':
_push_status(ret, item)
elif item_type == 'errorDetail':