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

dockerng: fix image_present for forced, non-existent image

Browse source 
With a non-existent image, which is forced, the call to `inspect_image`
will raise a `CommandExecutionError`: "Unable to get info for image".

This commit changes it to only call `inspect_image` for existing images.
This commit is contained in:
Daniel Hahler 2015-09-29 14:35:51 +02:00
parent 284984e6ba
commit e3c66cea3a
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/states/dockerng.py
View file

@ -446,17 +446,18 @@ def image_present(name,
image = ':'.join(_get_repo_tag(name))
all_tags = __salt__['dockerng.list_tags']()
if image in all_tags and not force:
ret['result'] = True
ret['comment'] = 'Image \'{0}\' already present'.format(name)
return ret
elif force:
try:
image_info = __salt__['dockerng.inspect_image'](name)
except Exception as exc:
ret['comment'] = \
'Unable to get info for image \'{0}\': {1}'.format(name, exc)
if image in all_tags:
if not force:
ret['result'] = True
ret['comment'] = 'Image \'{0}\' already present'.format(name)
return ret
else:
try:
image_info = __salt__['dockerng.inspect_image'](name)
except Exception as exc:
ret['comment'] = \
'Unable to get info for image \'{0}\': {1}'.format(name, exc)
return ret
else:
image_info = None