From: Franck Bui <fbui@suse.com>
Date: Fri, 10 Feb 2023 16:21:18 +0000 (+0100)
Subject: rename is_rpm_distribution() into is_dnf_distribution()
X-Git-Tag: v15~322^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24348cdc18b60f014d590f0b1d823f58bc7766b7;p=thirdparty%2Fmkosi.git

rename is_rpm_distribution() into is_dnf_distribution()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index a396b120c..b57b1e0db 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -42,7 +42,7 @@ from mkosi.backend import (
     flatten,
     format_rlimit,
     is_centos_variant,
-    is_rpm_distribution,
+    is_dnf_distribution,
     patch_file,
     path_relative_to_cwd,
     set_umask,
@@ -2670,8 +2670,8 @@ def load_args(args: argparse.Namespace) -> MkosiConfig:
     if args.ssh_port <= 0:
         die("--ssh-port must be > 0")
 
-    if args.repo_dirs and not (is_rpm_distribution(args.distribution) or args.distribution == Distribution.arch):
-        die("--repository-directory is only supported on RPM based distributions and Arch")
+    if args.repo_dirs and not (is_dnf_distribution(args.distribution) or args.distribution == Distribution.arch):
+        die("--repository-directory is only supported on DNF based distributions and Arch")
 
     if args.repo_dirs:
         args.repo_dirs = [p.absolute() for p in args.repo_dirs]
@@ -2687,8 +2687,8 @@ def load_args(args: argparse.Namespace) -> MkosiConfig:
     if args.qemu_kvm and not qemu_check_kvm_support():
         die("Sorry, the host machine does not support KVM acceleration.")
 
-    if args.repositories and not is_rpm_distribution(args.distribution) and args.distribution not in (Distribution.debian, Distribution.ubuntu):
-        die("Sorry, the --repositories option is only supported on RPM/Debian based distributions")
+    if args.repositories and not is_dnf_distribution(args.distribution) and args.distribution not in (Distribution.debian, Distribution.ubuntu):
+        die("Sorry, the --repositories option is only supported on DNF/Debian based distributions")
 
     return MkosiConfig(**vars(args))
 
diff --git a/mkosi/backend.py b/mkosi/backend.py
index 46bb2d571..3868cc6b7 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -182,7 +182,7 @@ def detect_distribution() -> tuple[Optional[Distribution], Optional[str]]:
     return d, version_id
 
 
-def is_rpm_distribution(d: Distribution) -> bool:
+def is_dnf_distribution(d: Distribution) -> bool:
     return d in (
         Distribution.fedora,
         Distribution.mageia,