Explorar el Código

Fix when /usr/bin/python isn't a symlink

rdb hace 16 años
padre
commit
2af783dc28
Se han modificado 1 ficheros con 8 adiciones y 6 borrados
  1. 8 6
      makepanda/makepandacore.py

+ 8 - 6
makepanda/makepandacore.py

@@ -1359,18 +1359,20 @@ def SdkLocatePython(force_use_sys_executable = False):
             SDK["PYTHON"] = os.path.dirname(sysconfig.get_python_inc())
             SDK["PYTHON"] = os.path.dirname(sysconfig.get_python_inc())
             SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()
             SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()
             SDK["PYTHONEXEC"] = sys.executable
             SDK["PYTHONEXEC"] = sys.executable
-        elif (sys.platform == "darwin"):
-            SDK["PYTHON"] = sysconfig.get_python_inc()
-            SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()
-            SDK["PYTHONEXEC"] = sys.executable
         else:
         else:
             SDK["PYTHON"] = sysconfig.get_python_inc()
             SDK["PYTHON"] = sysconfig.get_python_inc()
             SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()
             SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()
-            SDK["PYTHONEXEC"] = os.path.join(os.path.dirname(sys.executable), os.readlink(sys.executable))
+            if (os.path.islink(sys.executable)):
+                SDK["PYTHONEXEC"] = os.path.join(os.path.dirname(sys.executable), os.readlink(sys.executable))
+            else:
+                SDK["PYTHONEXEC"] = sys.executable
     elif (sys.platform == "darwin"):
     elif (sys.platform == "darwin"):
         SDK["PYTHONEXEC"] = sys.executable
         SDK["PYTHONEXEC"] = sys.executable
     else:
     else:
-        SDK["PYTHONEXEC"] = os.path.join(os.path.dirname(sys.executable), os.readlink(sys.executable))
+        if (os.path.islink(sys.executable)):
+            SDK["PYTHONEXEC"] = os.path.join(os.path.dirname(sys.executable), os.readlink(sys.executable))
+        else:
+            SDK["PYTHONEXEC"] = sys.executable
 
 
 def SdkLocateVisualStudio():
 def SdkLocateVisualStudio():
     if (sys.platform != "win32"): return
     if (sys.platform != "win32"): return