Merge pull request #2882 from lorengordon/fix/salt-3006-1

plus3it · May 12, 2023 · c67e8ef · c67e8ef
2 parents a7b3c54 + f7090e1
commit c67e8ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/watchmaker/workers/salt.py b/src/watchmaker/workers/salt.py
@@ -935,12 +935,21 @@ def _get_salt_call():
         """Retrieve installation path for Salt if it exists."""
         system_drive = os.environ['systemdrive']
         program_files = os.environ['ProgramFiles']
-
-        new_salt_path = os.sep.join((program_files, 'Salt Project', 'Salt',
-                                     'salt-call.bat'))
         old_salt_path = os.sep.join((system_drive, 'Salt', 'salt-call.bat'))
-        if os.path.isfile(new_salt_path):
-            return new_salt_path
+
+        new_salt_paths = [
+            os.sep.join(
+                (program_files, 'Salt Project', 'Salt', 'salt-call.exe')
+            ),
+            os.sep.join(
+                (program_files, 'Salt Project', 'Salt', 'salt-call.bat')
+            ),
+        ]
+
+        for salt_path in new_salt_paths:
+            if os.path.isfile(salt_path):
+                return salt_path
+
         return old_salt_path
 
     def install(self):

diff --git a/tests/test_saltworker.py b/tests/test_saltworker.py
@@ -481,7 +481,7 @@ def test_windows_salt_call_old():
 def test_windows_salt_call_new():
     """Ensure new path is tested."""
     salt_path = os.sep.join(("C:\\Program Files", 'Salt Project',
-                             'Salt', 'salt-call.bat'))
+                             'Salt', 'salt-call.exe'))
     assert SaltWindows._get_salt_call() == salt_path