From 57fba60edad8961ce541538444629a697091ae9b Mon Sep 17 00:00:00 2001
From: Sergey Kizunov <sergey.kizunov@ni.com>
Date: Fri, 15 May 2015 16:06:15 -0500
Subject: [PATCH] Make extensionless scripts runable in Windows

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>
---
 scripts/salt-master | 12 ++++++++++++
 scripts/salt-minion | 12 ++++++++++++
 scripts/salt-unity  | 15 +++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/scripts/salt-master b/scripts/salt-master
index 05a14d765f8..eeaae97c507 100755
--- a/scripts/salt-master
+++ b/scripts/salt-master
@@ -4,7 +4,19 @@ Start the salt-master
 '''
 
 from salt.scripts import salt_master
+from salt.utils import is_windows
 
 
 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)
     salt_master()
diff --git a/scripts/salt-minion b/scripts/salt-minion
index 1f83921b725..e787fd8f229 100755
--- a/scripts/salt-minion
+++ b/scripts/salt-minion
@@ -4,10 +4,22 @@ This script is used to kick off a salt minion daemon
 '''
 
 from salt.scripts import salt_minion
+from salt.utils import is_windows
 from multiprocessing import freeze_support
 
 
 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)
     # This handles the bootstrapping code that is included with frozen
     # scripts. It is a no-op on unfrozen code.
     freeze_support()
diff --git a/scripts/salt-unity b/scripts/salt-unity
index 53ff9b8b0c0..c81ed60b669 100644
--- a/scripts/salt-unity
+++ b/scripts/salt-unity
@@ -5,6 +5,8 @@ import sys
 
 # Import salt libs
 import salt.scripts
+from salt.utils import is_windows
+
 
 def get_avail():
     '''
@@ -16,6 +18,7 @@ def get_avail():
             ret.append(fun[5:])
     return ret
 
+
 def redirect():
     '''
     Change the args and redirect to another salt script
@@ -38,5 +41,17 @@ def redirect():
         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()