openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 02:11:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

!352 syscap_collector.py 脚本的规范类修改

Browse Source 
Merge pull request !352 from ezio_cc/master
This commit is contained in:
openharmony_ci
2023-12-11 09:13:21 +00:00
committed by Gitee
parent 4c46c3ecf8 d7988bef2e
commit c78878bd18
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/syscap_collector.py
+8 -10
View File
@@ -82,13 +82,12 @@ def read_json_file(bundle_json_path: str) -> tuple:
bundle_syscap_list = list()
error_list = dict()
try:
f = open(bundle_json_path, 'r', encoding='utf-8')
bundle_data = json.load(f)
component_data = bundle_data.get("component")
component_syscaps_list = component_data.get("syscap")
if component_syscaps_list:
bundle_syscap_list = bundle_syscap_list_handler(bundle_syscap_list, component_syscaps_list)
f.close()
with open(bundle_json_path, 'r', encoding='utf-8') as f:
bundle_data = json.load(f)
component_data = bundle_data.get("component")
component_syscaps_list = component_data.get("syscap")
if component_syscaps_list:
bundle_syscap_list = bundle_syscap_list_handler(bundle_syscap_list, component_syscaps_list)
except FileNotFoundError as e:
error_list[bundle_json_path] = str(e)
except Exception as e:
@@ -98,9 +97,8 @@ def read_json_file(bundle_json_path: str) -> tuple:
def get_all_components_path(components_file_path: str):
try:
f = open(components_file_path, 'r', encoding='utf-8')
path_dict = json.load(f)
f.close()
with open(components_file_path, 'r', encoding='utf-8') as f:
path_dict = json.load(f)
return path_dict
except FileNotFoundError:
logging.error(r"PATH ERROR")