platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 10:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add get_original_version to public utils API

Browse Source
This commit is contained in:
Ivan Kravets
2019-04-17 23:20:45 +03:00
parent c084db1619
commit f63041a402
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platformio/commands/platform.py
View File

@ -54,18 +54,6 @@ def _get_registry_platforms():
return platforms return platforms
def _original_version(version):
if version.count(".") != 2:
return None
_, y = version.split(".")[:2]
if int(y) < 100:
return None
if len(y) % 2 != 0:
y = "0" + y
parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))]
return ".".join(parts)
def _get_platform_data(*args, **kwargs): def _get_platform_data(*args, **kwargs):
try: try:
return _get_installed_platform_data(*args, **kwargs) return _get_installed_platform_data(*args, **kwargs)
@ -122,7 +110,7 @@ def _get_installed_platform_data(platform,
continue continue
item[key] = value item[key] = value
if key == "version": if key == "version":
item["originalVersion"] = _original_version(value) item["originalVersion"] = util.get_original_version(value)
data['packages'].append(item) data['packages'].append(item)
return data return data

12
platformio/util.py
View File

@ -849,6 +849,18 @@ def ensure_udev_rules():
return True return True
def get_original_version(version):
if version.count(".") != 2:
return None
_, y = version.split(".")[:2]
if int(y) < 100:
return None
if len(y) % 2 != 0:
y = "0" + y
parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))]
return ".".join(parts)
def rmtree_(path): def rmtree_(path):
def _onerror(_, name, __): def _onerror(_, name, __):