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

Stages/dnf5.sbom.spdx: don't use format strings for constructing paths

Browse source 
Use the new helper function `osbuild.util.path.join_abs()` for
constructing paths.

Fix #1964

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-12-19 14:34:14 +01:00 • committed by Brian C. Lane
parent b6dd45af4d
commit 806f949e8c
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
stages/org.osbuild.dnf5.sbom.spdx
View file

@ -7,6 +7,7 @@ import tempfile
import libdnf5 import libdnf5
import osbuild import osbuild
from osbuild.util import path
from osbuild.util.sbom.dnf5 import dnf_pkgset_to_sbom_pkgset from osbuild.util.sbom.dnf5 import dnf_pkgset_to_sbom_pkgset
from osbuild.util.sbom.spdx import sbom_pkgset_to_spdx2_doc from osbuild.util.sbom.spdx import sbom_pkgset_to_spdx2_doc
@ -17,18 +18,18 @@ def get_installed_packages(tree):
conf = base.get_config() conf = base.get_config()
conf.installroot = tree conf.installroot = tree
conf.config_file_path = f"{tree}{conf.config_file_path}" conf.config_file_path = path.join_abs(tree, conf.config_file_path)
conf.pluginpath = f"{tree}{conf.pluginpath}" conf.pluginpath = path.join_abs(tree, conf.pluginpath)
conf.pluginconfpath = f"{tree}{conf.pluginconfpath}" conf.pluginconfpath = path.join_abs(tree, conf.pluginconfpath)
conf.persistdir = f"{tree}{conf.persistdir}" conf.persistdir = path.join_abs(tree, conf.persistdir)
conf.transaction_history_dir = f"{tree}{conf.transaction_history_dir}" conf.transaction_history_dir = path.join_abs(tree, conf.transaction_history_dir)
conf.system_cachedir = f"{tempdir}{conf.system_cachedir}" conf.system_cachedir = path.join_abs(tempdir, conf.system_cachedir)
conf.varsdir = [f"{tree}{d}" for d in conf.varsdir] conf.varsdir = [path.join_abs(tree, d) for d in conf.varsdir]
conf.reposdir = [f"{tree}{d}" for d in conf.reposdir] conf.reposdir = [path.join_abs(tree, d) for d in conf.reposdir]
conf.cachedir = f"{tempdir}{conf.cachedir}" conf.cachedir = path.join_abs(tempdir, conf.cachedir)
if os.path.exists(f"{tree}{conf.system_state_dir}"): if os.path.exists(path.join_abs(tree, conf.system_state_dir)):
conf.system_state_dir = f"{tree}{conf.system_state_dir}" conf.system_state_dir = path.join_abs(tree, conf.system_state_dir)
else: else:
# NB: if the directory does not exist in the tree, DNF5 would create it. # NB: if the directory does not exist in the tree, DNF5 would create it.
# We need to ensure that the stage does not taint the tree with directories # We need to ensure that the stage does not taint the tree with directories