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

Merge pull request #5118 from hulu/netbsdservice-shadowing

Browse Source 
netbsdservice mod: status -> service_status, to avoid shadowing status()
This commit is contained in:
Thomas S Hatch 2013-05-17 20:20:51 -07:00
commit e75255dc95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/netbsdservice.py
View File

@ -90,14 +90,14 @@ def status(name, sig=None):
return not __salt__['cmd.retcode'](cmd)
def _get_svc(rcd, status):
def _get_svc(rcd, service_status):
'''
Returns a unique service status
'''
ena = None
for rcvar in __salt__['cmd.run']('{0} rcvar'.format(rcd)
).splitlines():
if rcvar.startswith('$') and '={0}'.format(status) in rcvar:
if rcvar.startswith('$') and '={0}'.format(service_status) in rcvar:
ena = 'yes'
elif rcvar.startswith('#'):
svc = rcvar.split(' ', 1)[1]
@ -109,7 +109,7 @@ def _get_svc(rcd, status):
return None
def _get_svc_list(status):
def _get_svc_list(service_status):
'''
Returns all service statuses
'''
@ -117,7 +117,7 @@ def _get_svc_list(status):
ret = set()
lines = glob.glob('{0}*'.format(prefix))
for line in lines:
svc = _get_svc(line, status)
svc = _get_svc(line, service_status)
if svc is not None:
ret.add(svc)
@ -156,14 +156,14 @@ def get_all():
'''
return _get_svc_list('')
def _rcconf_status(name, status):
def _rcconf_status(name, service_status):
'''
Modifies /etc/rc.conf so a service is started or not at boot time and
can be started via /etc/rc.d/<service>
'''
rcconf = '/etc/rc.conf'
rxname = '^{0}=.*'.format(name)
newstatus = '{0}={1}'.format(name, status)
newstatus = '{0}={1}'.format(name, service_status)
ret = __salt__['cmd.retcode']('grep \'{0}\' {1}'.format(rxname, rcconf))
if ret == 0: # service found in rc.conf, modify its status
# NetBSD sed does not support -i flag, call sed by hand