mock: make --dnf-cmd compatible with DNF5

Fix #1400
rpm-software-management · Nov 14, 2024 · 8026806 · 8026806
1 parent ef5e4d0
commit 8026806
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/mock/py/mockbuild/config.py b/mock/py/mockbuild/config.py
@@ -629,7 +629,11 @@ def set_config_opts_per_cmdline(config_opts, options, args):
     if options.mode == 'yum-cmd':
         config_opts['package_manager'] = 'yum'
     if options.mode == 'dnf-cmd':
-        config_opts['package_manager'] = 'dnf'
+        # If config specifies a different package manager (e.g. yum), force
+        # using dnf. However, if config specifies its preference on either dnf
+        # or dnf5, respect that preference.
+        if config_opts['package_manager'] not in ['dnf', 'dnf5']:
+            config_opts['package_manager'] = 'dnf'
 
     if options.short_circuit:
         config_opts['short_circuit'] = options.short_circuit

diff --git a/releng/release-notes-next/dnf-cmd.bugfix b/releng/release-notes-next/dnf-cmd.bugfix
@@ -0,0 +1 @@
+Make `--dnf-cmd` compatible with DNF5