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 #27705 from rallytime/merge-27602

Browse source 
Merge #27602 with final pylint fix
This commit is contained in:
Nicole Thomas 2015-10-05 17:36:50 -06:00
commit 2491ce40f1
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
salt/modules/dockerng.py
View file

@ -247,6 +247,7 @@ import time
# Import Salt libs
from salt.exceptions import CommandExecutionError, SaltInvocationError
from salt.ext.six.moves import map # pylint: disable=import-error,redefined-builtin
from salt.utils.decorators \
import identical_signature_wrapper as _mimic_signature
import salt.utils
@ -490,6 +491,7 @@ def __virtual__():
docker_py_versioninfo = _get_docker_py_versioninfo()
except CommandExecutionError:
docker_py_versioninfo = None
# Don't let a failure to interpret the version keep this module from
# loading. Log a warning (log happens in _get_docker_py_versioninfo()).
if docker_py_versioninfo is None \
@ -498,17 +500,22 @@ def __virtual__():
docker_versioninfo = version().get('VersionInfo')
except CommandExecutionError:
docker_versioninfo = None
if docker_versioninfo is None or docker_versioninfo >= MIN_DOCKER:
return __virtualname__
else:
log.warning(
return (False,
'Insufficient Docker version for dockerng (required: '
'{0}, installed: {1})'.format(
'.'.join(docker_versioninfo),
'.'.join(MIN_DOCKER)
)
)
return False
'.'.join(map(str, MIN_DOCKER)),
'.'.join(map(str, docker_versioninfo))))
else:
return (False,
'Insufficient docker-py version for dockerng (required: '
'{0}, installed: {1})'.format(
'.'.join(map(str, MIN_DOCKER_PY)),
'.'.join(map(str, docker_py_versioninfo))))
return (False, 'Docker module could not get imported')
def _get_docker_py_versioninfo():