From 7f11dc19cdfa1480fe6889d87609e83707837b41 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Sep 2020 19:31:07 +0200 Subject: [PATCH] makepanda: fix ABI flags not being stripped from PYTHONVERSION --- makepanda/makepackage.py | 2 +- makepanda/makepandacore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py index 8e1f9bb2fa..59125ac9bd 100755 --- a/makepanda/makepackage.py +++ b/makepanda/makepackage.py @@ -867,7 +867,7 @@ def MakeInstallerFreeBSD(version, runtime=False, python_versions=[], **kwargs): oscmd("rm -f %s/tmp/python_dep" % outputdir) if "PYTHONVERSION" in SDK: - pyver_nodot = SDK["PYTHONVERSION"][6:].replace('.', '') + pyver_nodot = SDK["PYTHONVERSION"][6:].rstrip('dmu').replace('.', '') else: pyver_nodot = "%d%d" % (sys.version_info[:2]) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 307115bcd0..ca4acfa700 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -3586,7 +3586,7 @@ def GetCurrentPythonVersionInfo(): from distutils.sysconfig import get_python_lib return { - "version": SDK["PYTHONVERSION"][6:], + "version": SDK["PYTHONVERSION"][6:].rstrip('dmu'), "soabi": GetPythonABI(), "ext_suffix": GetExtensionSuffix(), "executable": sys.executable,