#1406 gather: handle mirrorlist in kickstart
Merged 3 years ago by lsedlar. Opened 3 years ago by fepitre.
fepitre/pungi mirrorlist  into  master

file modified
+14 -11
@@ -125,23 +125,26 @@ 

          if ks_repo.name not in gather_opts.lookaside_repos:

              continue

  

-         if not getattr(ks_repo, "metalink", False):

-             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl, enablegroups=False)

+         if getattr(ks_repo, "metalink", False):

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl, enablegroups=False,

+                              metalink=ks_repo.metalink)

+         elif getattr(ks_repo, "mirrorlist", False):

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl, enablegroups=False,

+                              mirrorlist=ks_repo.mirrorlist)

          else:

-             dnf_obj.add_repo(

-                 ks_repo.name,

-                 ks_repo.baseurl,

-                 enablegroups=False,

-                 metalink=ks_repo.metalink,

-             )

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl, enablegroups=False)

  

      for ks_repo in ksparser.handler.repo.repoList:

          if ks_repo.name in gather_opts.lookaside_repos:

              continue

-         if not getattr(ks_repo, "metalink", False):

-             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl)

+         if getattr(ks_repo, "metalink", False):

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl,

+                              metalink=ks_repo.metalink)

+         elif getattr(ks_repo, "mirrorlist", False):

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl,

+                              mirrorlist=ks_repo.mirrorlist)

          else:

-             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl, metalink=ks_repo.metalink)

+             dnf_obj.add_repo(ks_repo.name, ks_repo.baseurl)

  

      with Profiler("DnfWrapper.fill_sack()"):

          dnf_obj.fill_sack(load_system_repo=False, load_available_repos=True)

no initial comment

This looks good to me. I'll fix the formatting issues detected by Black and merge manually.

Commit b973657 fixes this pull-request

Pull-Request has been merged by lsedlar

3 years ago