M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
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:54:41 +08:00
parent 45f62d4e2d
commit 478972a001
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/coredevice/comm_generic.py
View File

@ -233,8 +233,9 @@ class CommGeneric:
raise UnsupportedDevice("Unsupported runtime ID: {}" raise UnsupportedDevice("Unsupported runtime ID: {}"
.format(runtime_id)) .format(runtime_id))
gateware_version = self._read_chunk(self._read_length).decode("utf-8") gateware_version = self._read_chunk(self._read_length).decode("utf-8")
if gateware_version != software_version and \ gateware_release = gateware_version.split("+")[0]
gateware_version + ".dirty" != software_version: software_release = software_version.split("+")[0]
if gateware_release != software_release:
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)