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

salt style guideline

Browse source
This commit is contained in:
matt LLVW 2018-12-03 21:02:43 +01:00
parent 823c4ad0e3
commit 38addd19e7
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/states/service.py
View file

@ -426,8 +426,8 @@ def running(name,
# See if the service is already running
if before_toggle_status:
ret['comment'] = '\n'.join(
filter(None, ['The service {0} is already running'.format(name),
unmask_ret['comment']])
[_f for _f in ['The service {0} is already running'.format(name),
unmask_ret['comment']] if _f]
)
if enable is True and not before_toggle_enable_status:
ret.update(_enable(name, None, **kwargs))
@ -439,9 +439,8 @@ def running(name,
if __opts__['test']:
ret['result'] = None
ret['comment'] = '\n'.join(
filter(None, ['Service {0} is set to start'.format(name),
unmask_ret['comment']]
))
[_f for _f in ['Service {0} is set to start'.format(name),
unmask_ret['comment']] if _f])
return ret
# Conditionally add systemd-specific args to call to service.start