From 5fb0f3b4634e6c3cd24bd9d2a45c863370c68881 Mon Sep 17 00:00:00 2001 From: lixiang_yewu Date: Thu, 17 Aug 2023 07:37:22 +0000 Subject: [PATCH] update release-assistant/tools/compare_pkgs_cvrf_release_branched.py. Signed-off-by: lixiang_yewu --- .../compare_pkgs_cvrf_release_branched.py | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/release-assistant/tools/compare_pkgs_cvrf_release_branched.py b/release-assistant/tools/compare_pkgs_cvrf_release_branched.py index b8243b2..3edb83b 100644 --- a/release-assistant/tools/compare_pkgs_cvrf_release_branched.py +++ b/release-assistant/tools/compare_pkgs_cvrf_release_branched.py @@ -41,23 +41,26 @@ def resolve_xml(cvrf: str) -> dict: warnings.filterwarnings("ignore", category=DeprecationWarning) xml_result = {} ssl._create_default_https_context = ssl._create_unverified_context - cvrf_url = "https://repo.openeuler.org/security/data/cvrf/{}".format(cvrf) - raw_xml = urlopen(cvrf_url) - tree = et.parse(raw_xml) - root = tree.getroot() - - # resolve packages' version from cvrf files. - for branch in root[6]: - if branch.attrib["Name"] == "openEuler": - continue - for product in branch: - version_branch = product.attrib['CPE'].split(":", 3)[-1].replace(":", "-") - pkg_arch = product.text.rsplit(".", 2)[-2] - pkgs_of_branch = xml_result.get(version_branch, {}) - temp_list = pkgs_of_branch.get(pkg_arch, []) - temp_list.append(product.text) - pkgs_of_branch[pkg_arch] = temp_list - xml_result[version_branch] = pkgs_of_branch + try: + cvrf_url = "https://repo.openeuler.org/security/data/cvrf/{}".format(cvrf) + raw_xml = urlopen(cvrf_url) + tree = et.parse(raw_xml) + root = tree.getroot() + + # resolve packages' version from cvrf files. + for branch in root[6]: + if branch.attrib["Name"] == "openEuler": + continue + for product in branch: + version_branch = product.attrib['CPE'].split(":", 3)[-1].replace(":", "-") + pkg_arch = product.text.rsplit(".", 2)[-2] + pkgs_of_branch = xml_result.get(version_branch, {}) + temp_list = pkgs_of_branch.get(pkg_arch, []) + temp_list.append(product.text) + pkgs_of_branch[pkg_arch] = temp_list + xml_result[version_branch] = pkgs_of_branch + except Exception as e: + print("Error resolving XML:", e) return xml_result -- Gitee