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

Prevent inadvertent CommandExecutionError on daemontools module import

Browse Source
This commit is contained in:
Bryan Chow 2013-07-30 00:18:56 -07:00
parent 2bcecced88
commit c8a196b6bb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/daemontools.py
View File

@ -29,14 +29,14 @@ for service_dir in VALID_SERVICE_DIRS:
if os.path.exists(service_dir):
SERVICE_DIR = service_dir
break
if not SERVICE_DIR:
raise CommandExecutionError("Could not find service directory.")
def _service_path(name):
'''
build service path
'''
if not SERVICE_DIR:
raise CommandExecutionError("Could not find service directory.")
return '{0}/{1}'.format(SERVICE_DIR, name)
@ -146,5 +146,7 @@ def get_all():
salt '*' daemontools.get_all
'''
if not SERVICE_DIR:
raise CommandExecutionError("Could not find service directory.")
#- List all daemontools services in
return sorted(os.listdir(SERVICE_DIR))