From 2af783dc286e912ed77b5320b3e0e1b147ac4521 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 5 Mar 2010 14:20:14 +0000 Subject: [PATCH] Fix when /usr/bin/python isn't a symlink --- makepanda/makepandacore.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index ee3bcbd2ab..a380958b67 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1359,18 +1359,20 @@ def SdkLocatePython(force_use_sys_executable = False): SDK["PYTHON"] = os.path.dirname(sysconfig.get_python_inc()) SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version() 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: SDK["PYTHON"] = sysconfig.get_python_inc() 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"): SDK["PYTHONEXEC"] = sys.executable 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(): if (sys.platform != "win32"): return