diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-03 15:12:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 15:12:59 +0200 |
| commit | ae184a117e456060925721b960b25832c4864eea (patch) | |
| tree | 40a48c56be761ca50ffdfdf5842f59ad9a0ee179 | |
| parent | f64336f1a7ff9c9414be4a82b3dc9fca6c659bf9 (diff) | |
| parent | 44f1b390a3604cc141502c76fbf15dd347fc327c (diff) | |
Merge pull request #27633 from akien-mga/scons-py3-fixup
SCons: Fix python3 compat for builtin_bullet=no
| -rw-r--r-- | platform/server/detect.py | 2 | ||||
| -rw-r--r-- | platform/x11/detect.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index 90a4092412..39f72db0ad 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -147,7 +147,7 @@ def configure(env): # We need at least version 2.88 import subprocess bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip() - if bullet_version < "2.88": + if str(bullet_version) < "2.88": # Abort as system bullet was requested but too old print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88")) sys.exit(255) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index b5ad59e60a..163b9999a9 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -197,7 +197,7 @@ def configure(env): # We need at least version 2.88 import subprocess bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip() - if bullet_version < "2.88": + if str(bullet_version) < "2.88": # Abort as system bullet was requested but too old print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88")) sys.exit(255) |