donate-cpu.py: improved error handling when fetching cppcheck version (#1780)
During a local scan it did not get any cppcheck versions causing the script to fail with an exception when creating the diff.
This commit is contained in:
parent
5cdde701ba
commit
6e6cdae20e
|
@ -40,7 +40,7 @@ import platform
|
||||||
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
|
# 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
|
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
|
||||||
# changes)
|
# changes)
|
||||||
CLIENT_VERSION = "1.1.20"
|
CLIENT_VERSION = "1.1.21"
|
||||||
|
|
||||||
|
|
||||||
def checkRequirements():
|
def checkRequirements():
|
||||||
|
@ -110,7 +110,8 @@ def getCppcheckVersions(server_address):
|
||||||
sock.connect(server_address)
|
sock.connect(server_address)
|
||||||
sock.send(b'GetCppcheckVersions\n')
|
sock.send(b'GetCppcheckVersions\n')
|
||||||
versions = sock.recv(256)
|
versions = sock.recv(256)
|
||||||
except socket.error:
|
except socket.error as err:
|
||||||
|
print('Failed to get cppcheck versions: ' + str(err))
|
||||||
return None
|
return None
|
||||||
sock.close()
|
sock.close()
|
||||||
return versions.decode('utf-8').split()
|
return versions.decode('utf-8').split()
|
||||||
|
@ -519,6 +520,9 @@ while True:
|
||||||
if cppcheckVersions is None:
|
if cppcheckVersions is None:
|
||||||
print('Failed to communicate with server, retry later')
|
print('Failed to communicate with server, retry later')
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
if len(cppcheckVersions) == 0:
|
||||||
|
print('Did not get any cppcheck versions from server, retry later')
|
||||||
|
sys.exit(1)
|
||||||
for ver in cppcheckVersions:
|
for ver in cppcheckVersions:
|
||||||
if ver == 'head':
|
if ver == 'head':
|
||||||
if not compile(cppcheckPath, jobs):
|
if not compile(cppcheckPath, jobs):
|
||||||
|
|
Loading…
Reference in New Issue