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 #10487 from obestwalter/develop

Browse Source 
use the value of __virtualname__ instead of a string
This commit is contained in:
Joseph Hall 2014-02-16 06:32:16 -07:00
commit 7d6fcf8ff5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/upstart.py
View File

@ -66,7 +66,7 @@ def __virtual__():
if os.path.isfile(debian_initctl):
initctl_version = salt.modules.cmdmod._run_quiet(debian_initctl + ' version')
if 'upstart' in initctl_version:
return 'service'
return __virtualname__
return False