More careful get_base_executable

windowsmss · Feb 15, 2022 · 1e70954 · 1e70954
1 parent 9d027ca
commit 1e70954
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/thonny/common.py b/thonny/common.py
@@ -361,12 +361,14 @@ def get_base_executable():
         return sys.executable
 
     if sys.platform == "win32":
-        result = sys.base_exec_prefix + "\\" + os.path.basename(sys.executable)
-        return normpath_with_actual_case(result)
-    elif os.path.islink(sys.executable):
+        guess = sys.base_exec_prefix + "\\" + os.path.basename(sys.executable)
+        if os.path.isfile(guess):
+            return normpath_with_actual_case(guess)
+
+    if os.path.islink(sys.executable):
         return os.path.realpath(sys.executable)
-    else:
-        raise RuntimeError("Don't know how to locate base executable")
+
+    raise RuntimeError("Don't know how to locate base executable")
 
 
 def get_augmented_system_path(extra_dirs):