swc-installation-test-2.py: Also look for extension-less paths

[swc-setup-installation-test.git] / setup / swc-installation-test-2.py

diff --git a/setup/swc-installation-test-2.py b/setup/swc-installation-test-2.py
index 3c1fc090beacd90291eacb14691a1b4302b73c90..3778d7f11830c8abf3293455a246e8276bb95e66 100755 (executable)
--- a/setup/swc-installation-test-2.py
+++ b/setup/swc-installation-test-2.py
@@ -455,25 +455,22 @@ class CommandDependency (Dependency):
         raise NotImplementedError(self.version_stream)
 
     def _get_version_stream(self, **kwargs):
-        try:
-            return self._get_command_version_stream(**kwargs)
-        except DependencyError as e:
-            if self.paths:
-                or_errors = [e]
-                for path in self.paths:
-                    try:
-                        return self._get_command_version_stream(
-                            command=path, **kwargs)
-                    except DependencyError as e:
-                        print('a')
-                        or_errors.append(e)
-                raise DependencyError(
-                    checker=self,
-                    message='errors finding {0} version'.format(
-                        self.full_name()),
-                    causes=or_errors)
-            else:
-                raise
+        paths = [self.command + (self.exe_extension or '')]
+        if self.exe_extension:
+            paths.append(self.command)  # also look at the extension-less path
+        if self.paths:
+            paths.extend(self.paths)
+        or_errors = []
+        for path in paths:
+            try:
+                return self._get_command_version_stream(command=path, **kwargs)
+            except DependencyError as e:
+                or_errors.append(e)
+        raise DependencyError(
+            checker=self,
+            message='errors finding {0} version'.format(
+                self.full_name()),
+            causes=or_errors)
 
     def _get_version(self):
         version_stream = self._get_version_stream()