Skip to content

donate_cpu_lib.py: use subprocess.check_call() so failed calls will actually raise an exception #4750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 1 commit into from
Feb 7, 2023
+4 −4
Merged

donate_cpu_lib.py: use subprocess.check_call() so failed calls will actually raise an exception #4750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/donate_cpu_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# 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.43"
CLIENT_VERSION = "1.3.44"

# Timeout for analysis with Cppcheck in seconds
CPPCHECK_TIMEOUT = 30 * 60
Expand All @@ -37,7 +37,7 @@ def detect_make():
for m in make_cmds:
try:
#print('{} --version'.format(m))
subprocess.call([m, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
subprocess.check_call([m, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
except OSError as e:
#print("'{}' not found ({})".format(m, e))
continue
Expand Down Expand Up @@ -65,7 +65,7 @@ def check_requirements():
for app in apps:
try:
#print('{} --version'.format(app))
subprocess.call([app, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
subprocess.check_call([app, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
except OSError:
print("Error: '{}' is required".format(app))
result = False
Expand Down Expand Up @@ -191,7 +191,7 @@ def compile_version(cppcheck_path):
else:
exclude_bin = 'cppcheck'
# TODO: how to support multiple compilers on the same machine? this will clean msbuild.exe files in a mingw32-make build and vice versa
subprocess.call(['git', 'clean', '-f', '-d', '-x', '--exclude', exclude_bin], cwd=cppcheck_path)
subprocess.check_call(['git', 'clean', '-f', '-d', '-x', '--exclude', exclude_bin], cwd=cppcheck_path)
return ret


Expand Down