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

Merge pull request #5077 from hulu/winserv-status-shadowing

Browse Source 
win_service mod: status -> statuses, to avoid shadowing same-named func
This commit is contained in:
Thomas S Hatch 2013-05-16 22:13:30 -07:00
commit 9f1384f3b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/win_service.py
View File

@ -184,8 +184,8 @@ def status(name, sig=None):
salt '*' service.status <service name> [service signature]
'''
cmd = 'sc query "{0}"'.format(name)
status = __salt__['cmd.run'](cmd).splitlines()
for line in status:
statuses = __salt__['cmd.run'](cmd).splitlines()
for line in statuses:
if 'RUNNING' in line:
return getsid(name)
elif 'PENDING' in line: