M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

coredevice: compare gateware and software versions on release numbers only. Closes #738

This commit is contained in:
Sebastien Bourdeauducq 2017-06-05 13:52:24 +08:00
parent 9c973793df
commit bea7a47349
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/coredevice/comm_kernel.py
View File

@ -284,15 +284,9 @@ class CommKernel:
.format(runtime_id)) .format(runtime_id))
gateware_version = self._read_string() gateware_version = self._read_string()
if gateware_version.endswith(".dirty"): gateware_release = gateware_version.split("+")[0]
gateware_version_clean = gateware_version[:-6] software_release = software_version.split("+")[0]
else: if gateware_release != software_release:
gateware_version_clean = gateware_version
if software_version.endswith(".dirty"):
software_version_clean = software_version[:-6]
else:
software_version_clean = software_version
if gateware_version_clean != software_version_clean:
logger.warning("Mismatch between gateware (%s) " logger.warning("Mismatch between gateware (%s) "
"and software (%s) versions", "and software (%s) versions",
gateware_version, software_version) gateware_version, software_version)