valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13220 from s0undt3ch/hotfix/lint

Browse Source 
String formatting should be Py2.6 compatible. Fixes #13218.
This commit is contained in:
Joseph Hall 2014-06-04 05:30:21 -06:00
commit af6dd62de4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/states/dockerio.py
View File

@ -346,7 +346,7 @@ def installed(name,
already_exists = cinfos['status'] already_exists = cinfos['status']
# if container exists but is not started, try to start it # if container exists but is not started, try to start it
if already_exists: if already_exists:
return _valid(comment='image {!r} already exists'.format(name)) return _valid(comment='image {0!r} already exists'.format(name))
dports, dvolumes, denvironment = {}, [], {} dports, dvolumes, denvironment = {}, [], {}
if not ports: if not ports:
ports = [] ports = []
@ -422,17 +422,17 @@ def absent(name):
is_running = __salt__['docker.is_running'](cid) is_running = __salt__['docker.is_running'](cid)
if is_running: if is_running:
return _invalid( return _invalid(
comment=('Container {!r}' comment=('Container {0!r}'
' could not be stopped'.format(cid))) ' could not be stopped'.format(cid)))
else: else:
return _valid(comment=('Container {!r}' return _valid(comment=('Container {0!r}'
' was stopped,'.format(cid)), ' was stopped,'.format(cid)),
changes={name: True}) changes={name: True})
else: else:
return _valid(comment=('Container {!r}' return _valid(comment=('Container {0!r}'
' is stopped,'.format(cid))) ' is stopped,'.format(cid)))
else: else:
return _valid(comment='Container {!r} not found'.format(name)) return _valid(comment='Container {0!r} not found'.format(name))
def present(name): def present(name):
@ -636,14 +636,14 @@ def running(name, container=None, port_bindings=None, binds=None,
is_running = __salt__['docker.is_running'](container) is_running = __salt__['docker.is_running'](container)
if is_running: if is_running:
return _valid( return _valid(
comment='Container {!r} started.\n'.format(container), comment='Container {0!r} started.\n'.format(container),
changes={name: True}) changes={name: True})
else: else:
return _invalid( return _invalid(
comment=('Container {!r}' comment=('Container {0!r}'
' cannot be started\n{!s}').format(container, ' cannot be started\n{0!s}').format(container,
started['out'])) started['out']))
else: else:
return _valid( return _valid(
comment='Container {!r} started.\n'.format(container), comment='Container {0!r} started.\n'.format(container),
changes={name: True}) changes={name: True})