From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 13 Jan 2023 12:06:45 +0000 (+0100)
Subject: Remove --use-host-repositories
X-Git-Tag: v15~365^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04e361af3f4651e9d9dd1b6c5dd8ba28fed0d1dc;p=thirdparty%2Fmkosi.git

Remove --use-host-repositories

This option is superseded by --repository-directory which can be
used for exactly the same purpose so let's remove this very specific
option in favor of using --repository-directory.
---

diff --git a/NEWS.md b/NEWS.md
index 753c708c5..e9134694a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -29,6 +29,7 @@
     We also remove the WithoutUnifiedKernelImages= switch as building unified
     kernel images is trivial and fast these days.
 - Support for --qemu-boot was dropped
+- Support for --use-host-repositories was dropped, use --repository-directory instead
 
 ## v14
 
diff --git a/mkosi.md b/mkosi.md
index 195b34101..cad84edbc 100644
--- a/mkosi.md
+++ b/mkosi.md
@@ -320,16 +320,6 @@ a boolean argument: either "1", "yes", or "true" to enable, or "0",
   Linux, additional repositories must be passed in the form `<name>::<url>`
   (e.g. `myrepo::https://myrepo.net`).
 
-`UseHostRepositories=`, `--use-host-repositories`
-
-: This option is only applicable for RPM-based distributions:
-  *CentOS*, *Fedora Linux*, *Mageia*, *Rocky Linux*, *Alma Linux*
-  and *OpenMandriva*.
-  Allows use of the host's existing RPM repositories.
-  By default, a hardcoded set of default RPM repositories is generated and used.
-  Use `--repositories=` to identify a custom set of repositories to be enabled
-  and used for the build.
-
 `RepositoryDirectory`, `--repository-directory`
 
 : This option can (for now) only be used with RPM-based distributions and Arch
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index db7b12b6c..90d54abe3 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1717,12 +1717,6 @@ def create_parser() -> ArgumentParserMkosi:
         default=[],
         help="Repositories to use",
     )
-    group.add_argument(
-        "--use-host-repositories",
-        metavar="BOOL",
-        action=BooleanAction,
-        help="Use host's existing software repositories (only for dnf-based distributions)",
-    )
     group.add_argument(
         "--repository-directory",
         metavar="PATH",
@@ -3169,8 +3163,6 @@ def print_summary(config: MkosiConfig) -> None:
     if config.repositories is not None and len(config.repositories) > 0:
         print("              Repositories:", ",".join(config.repositories))
 
-    print("     Use Host Repositories:", yes_no(config.use_host_repositories))
-
     print("\nOUTPUT:")
 
     if config.hostname:
diff --git a/mkosi/backend.py b/mkosi/backend.py
index 53f24e4df..0f92046da 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -334,7 +334,6 @@ class MkosiConfig:
     local_mirror: Optional[str]
     repository_key_check: bool
     repositories: list[str]
-    use_host_repositories: bool
     repos_dir: Optional[str]
     repart_dir: Optional[str]
     architecture: str
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 7adc1d9b5..d8e4d1e43 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -170,10 +170,7 @@ def setup_dnf(state: MkosiState, repos: Sequence[Repo] = ()) -> None:
                 )
             )
 
-    if state.config.use_host_repositories:
-        default_repos  = ""
-    else:
-        default_repos  = f"reposdir={state.workspace} {state.config.repos_dir if state.config.repos_dir else ''}"
+    default_repos  = f"reposdir={state.workspace} {state.config.repos_dir if state.config.repos_dir else ''}"
 
     vars_dir = state.workspace / "vars"
     vars_dir.mkdir(exist_ok=True)
diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py
index 0c1d3d801..ec882a024 100644
--- a/tests/test_config_parser.py
+++ b/tests/test_config_parser.py
@@ -108,7 +108,6 @@ class MkosiConfig:
             "qcow2": False,
             "release": None,
             "repositories": [],
-            "use_host_repositories": False,
             "repos_dir": None,
             "base_image": None,
             "secure_boot": False,
@@ -219,8 +218,6 @@ class MkosiConfig:
                 self.reference_config[job_name]["release"] = mk_config_distro["Release"]
             if "Repositories" in mk_config_distro:
                 self._append_list("repositories", mk_config_distro["Repositories"], job_name)
-            if "UseHostRepositories" in mk_config_distro:
-                self.reference_config[job_name]["use_host_repositories"] = mk_config_distro["UseHostRepositories"]
             if "Mirror" in mk_config_distro:
                 self.reference_config[job_name]["mirror"] = mk_config_distro["Mirror"]
             if "Architecture" in mk_config_distro:
@@ -506,7 +503,6 @@ class MkosiConfigManyParams(MkosiConfigOne):
                 "Distribution": "fedora",
                 "Release": "28",
                 "Repositories": "http://fedora/repos",
-                "UseHostRepositories": False,
                 "Mirror": "http://fedora/mirror",
                 "Architecture": "i386",
             },
@@ -569,7 +565,6 @@ class MkosiConfigManyParams(MkosiConfigOne):
                 "Distribution": "ubuntu",
                 "Release": "18.04",
                 "Repositories": "http://ubuntu/repos",
-                "UseHostRepositories": False,
                 "Mirror": "http://ubuntu/mirror",
                 "Architecture": platform.machine(),
             },
@@ -629,7 +624,6 @@ class MkosiConfigManyParams(MkosiConfigOne):
                 "Distribution": "debian",
                 "Release": "unstable",
                 "Repositories": "http://debian/repos",
-                "UseHostRepositories": False,
                 "Mirror": "http://ubuntu/mirror",
                 "Architecture": platform.machine(),
             },