From b1785a03619c953ec9a1af7fd41fd6a647423ff2 Mon Sep 17 00:00:00 2001 From: objectified Date: Tue, 25 Aug 2015 02:18:37 -0400 Subject: [PATCH] replace compare_versions() with distutils.version --- lib/ansible/plugins/connections/docker.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/ansible/plugins/connections/docker.py b/lib/ansible/plugins/connections/docker.py index 983769622bc..0168f96fbef 100644 --- a/lib/ansible/plugins/connections/docker.py +++ b/lib/ansible/plugins/connections/docker.py @@ -26,6 +26,8 @@ import subprocess import time import re +from distutils.version import LooseVersion + import ansible.constants as C from ansible import errors @@ -46,7 +48,7 @@ class Connection(ConnectionBase): self.can_copy_bothways = False 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 def _get_docker_version(self): @@ -76,12 +78,6 @@ class Connection(ConnectionBase): def transport(self): 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): """ Connect to the container. Nothing to do """ if not self._connected: