From 54a29eaaa107b0116ce2a69973c425d7d3aa7897 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 23 May 2021 11:07:35 -0700 Subject: [PATCH] repo files: drop failovermethod=priority as it's not been used in years Additionally, newer fedora complains about it being invalid. It was used back in the yum days and never ported to dnf. Signed-off-by: Kevin Fenzi --- files/common/fedora-modular.repo | 3 --- files/common/fedora-updates-modular.repo | 3 --- files/common/fedora-updates-testing-modular.repo | 3 --- files/common/fedora-updates-testing.repo | 3 --- files/common/fedora-updates.repo | 3 --- files/common/fedora.repo | 3 --- 6 files changed, 18 deletions(-) diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo index cacbc82abd..7f69a45281 100644 --- a/files/common/fedora-modular.repo +++ b/files/common/fedora-modular.repo @@ -1,6 +1,5 @@ [fedora-modular] name=Fedora Modular $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/os/ {% else %} @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ {% else %} @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-source] name=Fedora Modular $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/source/tree/ {% else %} diff --git a/files/common/fedora-updates-modular.repo b/files/common/fedora-updates-modular.repo index e6633268f9..58d114804e 100644 --- a/files/common/fedora-updates-modular.repo +++ b/files/common/fedora-updates-modular.repo @@ -1,6 +1,5 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch enabled=1 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch enabled=0 @@ -18,7 +16,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-source] name=Fedora Modular $releasever - Updates Source -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch enabled=0 diff --git a/files/common/fedora-updates-testing-modular.repo b/files/common/fedora-updates-testing-modular.repo index 2047e50451..7b01cac09f 100644 --- a/files/common/fedora-updates-testing-modular.repo +++ b/files/common/fedora-updates-testing-modular.repo @@ -1,6 +1,5 @@ [updates-testing-modular] name=Fedora Modular $releasever - $basearch - Test Updates -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch enabled=0 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Test Updates Debug -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch enabled=0 @@ -18,7 +16,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-source] name=Fedora Modular $releasever - Test Updates Source -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch enabled=0 diff --git a/files/common/fedora-updates-testing.repo b/files/common/fedora-updates-testing.repo index 52f807b444..05e87ff1e3 100644 --- a/files/common/fedora-updates-testing.repo +++ b/files/common/fedora-updates-testing.repo @@ -1,6 +1,5 @@ [updates-testing] name=Fedora $releasever - $basearch - Test Updates -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-debuginfo] name=Fedora $releasever - $basearch - Test Updates Debug -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-source] name=Fedora $releasever - Test Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/SRPMS/ {% else %} diff --git a/files/common/fedora-updates.repo b/files/common/fedora-updates.repo index f01ae60fb7..04851e12c0 100644 --- a/files/common/fedora-updates.repo +++ b/files/common/fedora-updates.repo @@ -1,6 +1,5 @@ [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-source] name=Fedora $releasever - Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/SRPMS/ {% else %} diff --git a/files/common/fedora.repo b/files/common/fedora.repo index b8dcf7662e..794ade7733 100644 --- a/files/common/fedora.repo +++ b/files/common/fedora.repo @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-debuginfo] name=Fedora $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-source] name=Fedora $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched|int is defined else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch