From a68965f64a52cb237deb6e7014fb34ec2f344c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 3 Apr 2019 11:25:01 +0200 Subject: [PATCH] SCons: Fix python3 compat for builtin_bullet=no (cherry picked from commit 44f1b390a3604cc141502c76fbf15dd347fc327c) --- platform/server/detect.py | 2 +- 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 c3cb76b3cbe..b09b3b8bbda 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -90,7 +90,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 d187ce7b8b3..1f4d185f3c3 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -177,7 +177,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)