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

Fix dependencies and test for DNF4 based osbuild-depsolve-dnf

Browse source 
For the DNF4 version, we actually use 'dnf' package and not 'libdnf'.
Fix the SPEC file dependencies and also the check in unit test.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-09-19 17:16:15 +02:00 • committed by Tomáš Hozza
parent b1c14ed422
commit ca1a21b923
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
osbuild.spec
View file

@ -137,11 +137,11 @@ manifests and osbuild.
Summary: Dependency solving support for DNF
Requires: %{name} = %{version}-%{release}
# Fedora 41 and later use libdnf5, RHEL and Fedora < 41 use libdnf
# Fedora 41 and later use libdnf5, RHEL and Fedora < 41 use dnf
%if 0%{?fedora} >= 41
Requires: python3-libdnf5 >= 5.2.1
%else
Requires: python3-libdnf
Requires: python3-dnf
%endif
# osbuild 125 added a new "solver" field and osbuild-composer only

4
tools/test/test_depsolve.py
View file

@ -35,8 +35,8 @@ def assert_dnf5():
def assert_dnf():
if sp.run(["/usr/bin/python3", "-c", "import libdnf"], check=False).returncode != 0:
raise RuntimeError("Cannot import libdnf")
if sp.run(["/usr/bin/python3", "-c", "import dnf"], check=False).returncode != 0:
raise RuntimeError("Cannot import dnf")
def depsolve(transactions, repos, root_dir, cache_dir, dnf_config, opt_metadata, with_sbom=False) -> Tuple[dict, int]: