cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

replace compare_versions() with distutils.version

Browse source
This commit is contained in:
objectified 2015-08-25 02:18:37 -04:00
parent c39fb43ad9
commit b1785a0361
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/plugins/connections/docker.py
View file

@ -26,6 +26,8 @@ import subprocess
import time import time
import re import re
from distutils.version import LooseVersion
import ansible.constants as C import ansible.constants as C
from ansible import errors from ansible import errors
@ -46,7 +48,7 @@ class Connection(ConnectionBase):
self.can_copy_bothways = False self.can_copy_bothways = False
docker_version = self._get_docker_version() docker_version = self._get_docker_version()
if self.compare_versions(docker_version, '1.8.0') >= 0: if LooseVersion(docker_version) >= LooseVersion('1.8.0'):
self.can_copy_bothways = True self.can_copy_bothways = True
def _get_docker_version(self): def _get_docker_version(self):
@ -76,12 +78,6 @@ class Connection(ConnectionBase):
def transport(self): def transport(self):
return 'docker' return 'docker'
def compare_versions(self, version1, version2):
# Source: https://stackoverflow.com/questions/1714027/version-number-comparison
def normalize(v):
return [int(x) for x in re.sub(r'(\.0+)*$','', v).split(".")]
return cmp(normalize(version1), normalize(version2))
def _connect(self, port=None): def _connect(self, port=None):
""" Connect to the container. Nothing to do """ """ Connect to the container. Nothing to do """
if not self._connected: if not self._connected: