mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
57fba60eda
Previously, to make these run on Windows, I added the '.py'
extension. For example 'salt-master' => 'salt-master.py'
If this wasn't done, you would get an exception that looks like this
when spawning an addition process:
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "C:\salt\bin\lib\multiprocessing\forking.py",
line 380, in main
prepare(preparation_data)
File "C:\salt\bin\lib\multiprocessing\forking.py",
line 489, in prepare
file, path_name, etc = imp.find_module(main_name, dirs)
ImportError: No module named salt-master
Instead of adding the '.py' extension, I found another work-around that
seems to avoid the issue. The details are described in the file comments.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
58 lines
1.5 KiB
Python
58 lines
1.5 KiB
Python
#!/usr/bin/env python2
|
|
|
|
# Import python libs
|
|
import sys
|
|
|
|
# Import salt libs
|
|
import salt.scripts
|
|
from salt.utils import is_windows
|
|
|
|
|
|
def get_avail():
|
|
'''
|
|
Return the available salt commands
|
|
'''
|
|
ret = []
|
|
for fun in dir(salt.scripts):
|
|
if fun.startswith('salt'):
|
|
ret.append(fun[5:])
|
|
return ret
|
|
|
|
|
|
def redirect():
|
|
'''
|
|
Change the args and redirect to another salt script
|
|
'''
|
|
avail = get_avail()
|
|
if len(sys.argv) < 2:
|
|
msg = 'Must pass in a salt command, available commands are:'
|
|
for cmd in avail:
|
|
msg += '\n{0}'.format(cmd)
|
|
print(msg)
|
|
sys.exit(1)
|
|
cmd = sys.argv[1]
|
|
if cmd not in avail:
|
|
# Fall back to the salt command
|
|
sys.argv[0] = 'salt'
|
|
s_fun = salt.scripts.salt_main
|
|
else:
|
|
sys.argv[0] = 'salt-{0}'.format(cmd)
|
|
sys.argv.pop(1)
|
|
s_fun = getattr(salt.scripts, 'salt_{0}'.format(cmd))
|
|
s_fun()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if is_windows():
|
|
# Since this file does not have a '.py' extension, when running on
|
|
# Windows, spawning any addional processes will fail due to Python
|
|
# not being able to load this 'module' in the new process.
|
|
# Work around this by creating a '.pyc' file which will enable the
|
|
# spawned process to load this 'module' and proceed.
|
|
import os.path
|
|
import py_compile
|
|
cfile = os.path.splitext(__file__)[0] + '.pyc'
|
|
if not os.path.exists(cfile):
|
|
py_compile.compile(__file__, cfile)
|
|
redirect()
|