From b3129cf202b46c7fae974f4a3e99eb64e4f7d998 Mon Sep 17 00:00:00 2001
From: Davide Gardenal <davide.gardenal@huawei.com>
Date: Mon, 27 Jun 2022 10:18:04 +0200
Subject: [PATCH] cve-check: update symlinks
Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
---
meta-oniro-staging/classes/cve-check.bbclass | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta-oniro-staging/classes/cve-check.bbclass b/meta-oniro-staging/classes/cve-check.bbclass
index 1a229242..88f57571 100644
--- a/meta-oniro-staging/classes/cve-check.bbclass
+++ b/meta-oniro-staging/classes/cve-check.bbclass
@@ -630,8 +630,7 @@ def generate_json_report(d, report_file, report_link, filter=None):
"""
if os.path.exists(d.getVar("CVE_CHECK_JSON_INDEX_FILE")):
import json
- from oe.utils import create_safe_symlink
- from oe.cve_check import cve_check_merge_jsons
+ from oe.cve_check import cve_check_merge_jsons, update_symlinks
index_file = d.getVar("CVE_CHECK_JSON_INDEX_FILE")
report_dict = {"version":"1", "package": []}
@@ -641,7 +640,7 @@ def generate_json_report(d, report_file, report_link, filter=None):
with open(report_file, "w") as f:
json.dump(report_dict, f, indent=2)
- create_safe_symlink(report_file, report_link)
+ update_symlinks(report_file, report_link)
def generate_text_report(d, report_file, report_link, filter=None):
"""
@@ -659,14 +658,14 @@ def generate_text_report(d, report_file, report_link, filter=None):
"""
if os.path.exists(d.getVar("CVE_CHECK_TXT_INDEX_FILE")):
- from oe.utils import create_safe_symlink
+ from oe.cve_check import update_symlinks
index_file = d.getVar("CVE_CHECK_TXT_INDEX_FILE")
report_out = "".join(get_content_list(d, index_file, filter))
with open(report_file, "w") as f:
f.write(report_out)
- create_safe_symlink(report_file, report_link)
+ update_symlinks(report_file, report_link)
def generate_report(d, report_dir, report_name_base, extension, generator_func, link_override=None, gen_filter=None):
"""
--
GitLab