From b6dd45af4d0919052236cd8c9053a992b38966bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Thu, 19 Dec 2024 14:34:14 +0100 Subject: [PATCH] Stages/dnf4.sbom.spdx: don't use format strings for constructing paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the new helper function `osbuild.util.path.join_abs()` for constructing paths. Fix #1964 Signed-off-by: Tomáš Hozza --- stages/org.osbuild.dnf4.sbom.spdx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stages/org.osbuild.dnf4.sbom.spdx b/stages/org.osbuild.dnf4.sbom.spdx index f8671be0..9ecb1a9d 100755 --- a/stages/org.osbuild.dnf4.sbom.spdx +++ b/stages/org.osbuild.dnf4.sbom.spdx @@ -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)