particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/sbom/spdx: rename {,s}bom_pkgset_to_spdx2_doc()

Browse source 
Rename the function for consistency reason. The parent package is named
SBOM (originally BOM).

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-11-12 10:26:19 +01:00 • committed by Simon de Vlieger
parent 562a30ce93
commit f1c43ae5bd
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
osbuild/solver/dnf.py
View file

@ -9,7 +9,7 @@ import hawkey
from osbuild.solver import DepsolveError, MarkingError, RepoError, SolverBase, modify_rootdir_path, read_keys
from osbuild.util.sbom.dnf import dnf_pkgset_to_sbom_pkgset
from osbuild.util.sbom.spdx import bom_pkgset_to_spdx2_doc
from osbuild.util.sbom.spdx import sbom_pkgset_to_spdx2_doc
class DNF(SolverBase):
@ -168,7 +168,7 @@ class DNF(SolverBase):
For now, only SPDX v2 is supported.
"""
pkgset = dnf_pkgset_to_sbom_pkgset(pkgset)
spdx_doc = bom_pkgset_to_spdx2_doc(pkgset)
spdx_doc = sbom_pkgset_to_spdx2_doc(pkgset)
return spdx_doc.to_dict()
def dump(self):

4
osbuild/solver/dnf5.py
View file

@ -20,7 +20,7 @@ from osbuild.solver import (
read_keys,
)
from osbuild.util.sbom.dnf5 import dnf_pkgset_to_sbom_pkgset
from osbuild.util.sbom.spdx import bom_pkgset_to_spdx2_doc
from osbuild.util.sbom.spdx import sbom_pkgset_to_spdx2_doc
def remote_location(package, schemes=("http", "ftp", "file", "https")):
@ -286,7 +286,7 @@ class DNF5(SolverBase):
For now, only SPDX v2 is supported.
"""
pkgset = dnf_pkgset_to_sbom_pkgset(pkgset)
spdx_doc = bom_pkgset_to_spdx2_doc(pkgset)
spdx_doc = sbom_pkgset_to_spdx2_doc(pkgset)
return spdx_doc.to_dict()
def dump(self):