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

Stages/dnf4.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 89f94af60d
commit b6dd45af4d
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
stages/org.osbuild.dnf4.sbom.spdx
View file

@ -6,6 +6,7 @@ import tempfile
import dnf
import osbuild
from osbuild.util import path
from osbuild.util.sbom.dnf import dnf_pkgset_to_sbom_pkgset
from osbuild.util.sbom.spdx import sbom_pkgset_to_spdx2_doc
@ -14,11 +15,11 @@ def get_installed_packages(tree):
with tempfile.TemporaryDirectory() as tempdir:
conf = dnf.conf.Conf()
conf.installroot = tree
conf.persistdir = f"{tempdir}{conf.persistdir}"
conf.cachedir = f"{tempdir}{conf.cachedir}"
conf.reposdir = [f"{tree}{d}" for d in conf.reposdir]
conf.pluginconfpath = [f"{tree}{d}" for d in conf.pluginconfpath]
conf.varsdir = [f"{tree}{d}" for d in conf.varsdir]
conf.persistdir = path.join_abs(tempdir, conf.persistdir)
conf.cachedir = path.join_abs(tempdir, conf.cachedir)
conf.reposdir = [path.join_abs(tree, d) for d in conf.reposdir]
conf.pluginconfpath = [path.join_abs(tree, d) for d in conf.pluginconfpath]
conf.varsdir = [path.join_abs(tree, d) for d in conf.varsdir]
conf.prepend_installroot("config_file_path")
base = dnf.Base(conf)