From 4a5b742404238d34419d7943df314f4b364606df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=BF=94=E5=AE=87-wxy?= Date: Thu, 12 Jan 2023 09:57:22 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=8F=8A=E6=89=A9=E5=B1=95=E9=83=A8=E5=88=86=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王翔宇-wxy --- LibChecker/lib_checker.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/LibChecker/lib_checker.py b/LibChecker/lib_checker.py index 966c549..abe7452 100755 --- a/LibChecker/lib_checker.py +++ b/LibChecker/lib_checker.py @@ -300,7 +300,7 @@ def libchecker_checking_loop(): elif (l_tmp_dict[key]['necessity'][g_ostype]['level'] == "L0"): g_storejsondict.pop(key) elif (args.level == "l1l2l3"): - g_storejsondict = l_tmp_dict + g_storejsondict[key] = l_tmp_dict[key] else: g_storejsondict[key] = l_tmp_dict[key] if (l_tmp_dict[key]['necessity'][g_ostype]['level'] == "L3"): @@ -314,6 +314,24 @@ def libchecker_checking_loop(): l_dict_to_json={'Level': 'gen', 'Shared library':'gen', 'Required version': 'gen', 'Binary package':'gen'} g_genresults_to_json.update({ key4 : l_dict_to_json }) + if ( g_inputstrategy == "base" ): + print(g_genresults_to_json) + print(g_storejsondict) + for l_name in list(g_genresults_to_json.keys()): + if ( g_storejsondict[l_name]['necessity'][g_inputostype]['options'] != "basic" ): + del g_genresults_to_json[l_name] + elif( g_inputstrategy == "with-expand" ): + for l_name in list(g_genresults_to_json.keys()): + if ( len(g_storejsondict[l_name]['necessity'][g_inputostype]['options']) == 0 ): + del g_genresults_to_json[l_name] + elif( g_inputstrategy == "only-expand" ): + for l_name in list(g_genresults_to_json.keys()): + if ( g_storejsondict[l_name]['necessity'][g_inputostype]['options'] != "expansion" ): + del g_genresults_to_json[l_name] + else: + print("Error： --strategy 参数指定错误") + exit() + with open("Outputs/libchecker-output.json","w") as f: json.dump(g_genresults_to_json,f) -- Gitee