fix: crash by version handling

This commit is contained in:
Dr.Lt.Data 2024-07-27 22:08:19 +09:00
parent f0299e07f9
commit 8e1f792cd1
3 changed files with 1572 additions and 1512 deletions

View File

@ -489,7 +489,7 @@ def get_all_installed_node_specs():
latest = unified_manager.get_from_cnr_inactive_nodes(k) latest = unified_manager.get_from_cnr_inactive_nodes(k)
if latest is not None: if latest is not None:
node_spec_str = f"{k}@{latest}" node_spec_str = f"{k}@{str(latest[0])}"
res.append(node_spec_str) res.append(node_spec_str)
for k, _ in unified_manager.nightly_inactive_nodes.keys(): for k, _ in unified_manager.nightly_inactive_nodes.keys():

File diff suppressed because it is too large Load Diff

View File

@ -255,7 +255,7 @@ class UnifiedManager:
latest = self.get_from_cnr_inactive_nodes(node_name) latest = self.get_from_cnr_inactive_nodes(node_name)
if latest is not None: if latest is not None:
version_spec = latest[0] version_spec = str(latest[0])
else: else:
if node_name in self.nightly_inactive_nodes: if node_name in self.nightly_inactive_nodes:
version_spec = "nightly" version_spec = "nightly"
@ -2384,7 +2384,12 @@ async def get_unified_total_nodes(channel, mode):
elif cnr_id in unified_manager.cnr_inactive_nodes: elif cnr_id in unified_manager.cnr_inactive_nodes:
# disabled # disabled
v['state'] = 'disabled' v['state'] = 'disabled'
v['version'] = unified_manager.get_from_cnr_inactive_nodes(cnr_id)[0] cnr_ver = unified_manager.get_from_cnr_inactive_nodes(cnr_id)
if cnr_ver is not None:
v['version'] = str(cnr_ver[0])
else:
v['version'] = '0'
elif cnr_id in unified_manager.nightly_inactive_nodes: elif cnr_id in unified_manager.nightly_inactive_nodes:
# disabled # disabled
v['state'] = 'disabled' v['state'] = 'disabled'