From: Zbigniew Jędrzejewski-Szmek Date: Fri, 15 Oct 2021 10:19:12 +0000 (+0200) Subject: fedora: do not pull duplicate repo metadata on rawhide X-Git-Tag: v11~23^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ab6b99ba676a561adea51b8e1e8169dbbc6776;p=thirdparty%2Fmkosi.git fedora: do not pull duplicate repo metadata on rawhide --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 0015138d1..53aa5ff08 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2084,8 +2084,11 @@ def install_fedora(args: CommandLineArguments, root: Path, do_run_build_script: gpgpath = Path(f"/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-{args.releasever}-{arch}") gpgurl = urllib.parse.urljoin("https://getfedora.org/static/", gpgid) - repos = [Repo("fedora", f"Fedora {args.release.capitalize()} - base", release_url, gpgpath, gpgurl), - Repo("updates", f"Fedora {args.release.capitalize()} - updates", updates_url, gpgpath, gpgurl)] + repos = [Repo("fedora", f"Fedora {args.release.capitalize()} - base", release_url, gpgpath, gpgurl)] + if args.release != 'rawhide': + # On rawhide, the "updates" repo is the same as the "fedora" repo. + # In other versions, the "fedora" repo is frozen at release, and "updates" provides any new packages. + repos += [Repo("updates", f"Fedora {args.release.capitalize()} - updates", updates_url, gpgpath, gpgurl)] setup_dnf(args, root, repos)