Make 'package_manager = dnf4' equivalent to 'package_manager = dnf'

Fixes: #1271
rpm-software-management · Feb 16, 2024 · 6b57b22 · 6b57b22
1 parent f9398b0
commit 6b57b22
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/mock/py/mockbuild/package_manager.py b/mock/py/mockbuild/package_manager.py
@@ -18,10 +18,11 @@
 from .mounts import BindMountPoint
 
 fallbacks = {
-    'dnf': ['dnf', 'dnf5', 'yum'],
-    'yum': ['yum', 'dnf', 'dnf5'],
-    'microdnf': ['microdnf', 'dnf','dnf5', 'yum'],
-    'dnf5': ['dnf5', 'dnf', 'yum'],
+    'dnf4': ['dnf4', 'dnf5', 'yum'],
+    'dnf': ['dnf4', 'dnf5', 'yum'],  # backward-compat
+    'yum': ['yum', 'dnf4', 'dnf5'],
+    'microdnf': ['microdnf', 'dnf4', 'dnf5', 'yum'],
+    'dnf5': ['dnf5', 'dnf4', 'yum'],
 }
 
 
@@ -30,7 +31,9 @@ def package_manager_from_string(name):
         return Dnf5
     if name == 'yum':
         return Yum
-    if name == 'dnf':
+    if name == 'dnf4':
+        return Dnf
+    if name == 'dnf': # backward compat
         return Dnf
     if name == 'microdnf':
         return MicroDnf
@@ -671,7 +674,7 @@ def _check_missing(output):
 
 
 class Dnf(_PackageManager):
-    name = 'dnf'
+    name = 'dnf4'
     support_installroot = True
 
     def __init__(self, config, buildroot, plugins, bootstrap_buildroot):