From 7ee450ed210e1bf7eeb3c7084e98e34891ba012d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 18 Jul 2022 23:10:33 +0200 Subject: [PATCH] donate-cpu.py: fixed stupid mistakes in client version update notification (#4290) --- tools/donate-cpu.py | 4 ++-- tools/donate_cpu_lib.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/donate-cpu.py b/tools/donate-cpu.py index 53ceb13f9..077c63736 100755 --- a/tools/donate-cpu.py +++ b/tools/donate-cpu.py @@ -233,7 +233,7 @@ while True: p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) try: comm = p.communicate() - return comm[1] + return comm[0].decode(encoding='utf-8', errors='ignore').strip() except: return None @@ -288,6 +288,6 @@ while True: upload_info(package, info_output, server_address) if not max_packages or packages_processed < max_packages: print('Sleep 5 seconds..') - if (client_version_head is not None) and (StrictVersion(client_version_head) >= StrictVersion(get_client_version())): + if (client_version_head is not None) and (StrictVersion(client_version_head) > StrictVersion(get_client_version())): print("ATTENTION: A newer client version ({}) is available - please update!".format(client_version_head)) time.sleep(5) diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py index 0fe191fc2..dbd7504b0 100644 --- a/tools/donate_cpu_lib.py +++ b/tools/donate_cpu_lib.py @@ -15,7 +15,7 @@ import shlex # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # changes) -CLIENT_VERSION = "1.3.28" +CLIENT_VERSION = "1.3.29" # Timeout for analysis with Cppcheck in seconds CPPCHECK_TIMEOUT = 30 * 60