fixed: pre_startup - restart if script is executed

fixed: normalize cnr versions via StrictVersion
- 2.5 and 2.5.0 were regarded as different version
This commit is contained in:
Dr.Lt.Data
2025-02-15 17:21:45 +09:00
parent 12351bada7
commit abc26cf906
4 changed files with 35 additions and 4 deletions

View File

@@ -173,7 +173,10 @@ def read_cnr_info(fullpath):
project = data.get('project', {})
name = project.get('name').strip().lower()
version = project.get('version')
# normalize version
# for example: 2.5 -> 2.5.0
version = str(manager_util.StrictVersion(project.get('version')))
urls = project.get('urls', {})
repository = urls.get('Repository')

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 21, 2]
version_code = [3, 21, 3]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -513,7 +513,10 @@ class UnifiedManager:
if info:
cnr = self.cnr_map.get(info['id'])
if cnr:
return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
# normalize version
# for example: 2.5 -> 2.5.0
ver = str(manager_util.StrictVersion(info['version']))
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
else:
return None
else: