Merge pull request #961 from nemunaire/fix-docker-version-print

[docker] Fix formating error when remote host doesn't have required version
This commit is contained in:
Toshio Kuratomi 2015-03-18 19:51:45 -07:00
commit 76198a8223

View file

@ -657,9 +657,9 @@ class DockerManager(object):
' docker-py: %s, docker server apiversion %s; found' ' docker-py: %s, docker server apiversion %s; found'
' docker-py: %s, server: %s' % ( ' docker-py: %s, server: %s' % (
capability, capability,
'.'.join(self._cap_ver_req[capability][0]), '.'.join(map(str, self._cap_ver_req[capability][0])),
self._cap_ver_req[capability][1], self._cap_ver_req[capability][1],
'.'.join(self.docker_py_versioninfo), '.'.join(map(str, self.docker_py_versioninfo)),
api_version)) api_version))
def get_links(self, links): def get_links(self, links):