From 5bd6e76fa3c7445f217019869ec4065a94f71119 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 22 Jan 2017 09:54:55 +0100 Subject: ensure damned epel-rpm-macros never used --- el6i.cfg | 2 +- el6i55.cfg | 2 +- el6i56.cfg | 2 +- el6i70.cfg | 2 +- el6i71.cfg | 3 ++- el6it.cfg | 2 +- el6t55.cfg | 1 + el6t56.cfg | 1 + el6x.cfg | 1 + el6x55.cfg | 1 + el6x56.cfg | 1 + el6x70.cfg | 1 + el6x71.cfg | 1 + el6xt.cfg | 1 + el7t55.cfg | 1 + el7t56.cfg | 1 + el7x.cfg | 1 + el7x55.cfg | 1 + el7x56.cfg | 1 + el7x70.cfg | 1 + el7x71.cfg | 1 + el7xscl54.cfg | 1 + el7xscl55.cfg | 1 + el7xscl56.cfg | 1 + el7xscl70.cfg | 1 + el7xscl71.cfg | 1 + el7xt.cfg | 1 + 27 files changed, 28 insertions(+), 6 deletions(-) diff --git a/el6i.cfg b/el6i.cfg index 4498d2a..6489d09 100644 --- a/el6i.cfg +++ b/el6i.cfg @@ -70,7 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros [testing] name=epel-testing diff --git a/el6i55.cfg b/el6i55.cfg index 066189a..af606a2 100644 --- a/el6i55.cfg +++ b/el6i55.cfg @@ -70,7 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros [testing] name=epel-testing diff --git a/el6i56.cfg b/el6i56.cfg index b05f810..807ec63 100644 --- a/el6i56.cfg +++ b/el6i56.cfg @@ -70,7 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros [testing] name=epel-testing diff --git a/el6i70.cfg b/el6i70.cfg index fad7f1b..99e2a75 100644 --- a/el6i70.cfg +++ b/el6i70.cfg @@ -70,7 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros [testing] name=epel-testing diff --git a/el6i71.cfg b/el6i71.cfg index ad7ff1d..09de1bb 100644 --- a/el6i71.cfg +++ b/el6i71.cfg @@ -70,7 +70,8 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros + [testing] name=epel-testing diff --git a/el6it.cfg b/el6it.cfg index 1d79e6e..704ca1d 100644 --- a/el6it.cfg +++ b/el6it.cfg @@ -70,7 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386 failovermethod=priority -exclude=perl-Test-Exception +exclude=perl-Test-Exception epel-rpm-macros [testing] name=epel-testing diff --git a/el6t55.cfg b/el6t55.cfg index 62d7f9e..911a513 100644 --- a/el6t55.cfg +++ b/el6t55.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6t56.cfg b/el6t56.cfg index 2e4579f..7f249c2 100644 --- a/el6t56.cfg +++ b/el6t56.cfg @@ -59,6 +59,7 @@ name=BaseOS enabled=0 mirrorlist=http://mirrorlist.centos.org/?release=6&arch=x86_64&repo=os failovermethod=priority +exclude=epel-rpm-macros [updates] name=updates diff --git a/el6x.cfg b/el6x.cfg index aba83d1..412a9fa 100644 --- a/el6x.cfg +++ b/el6x.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6x55.cfg b/el6x55.cfg index 141cff6..aa84061 100644 --- a/el6x55.cfg +++ b/el6x55.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6x56.cfg b/el6x56.cfg index 0fd472b..a4eed5a 100644 --- a/el6x56.cfg +++ b/el6x56.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6x70.cfg b/el6x70.cfg index 16fd038..180308d 100644 --- a/el6x70.cfg +++ b/el6x70.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6x71.cfg b/el6x71.cfg index 7ff4a2e..296c970 100644 --- a/el6x71.cfg +++ b/el6x71.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el6xt.cfg b/el6xt.cfg index 59c6f8f..4c84d4c 100644 --- a/el6xt.cfg +++ b/el6xt.cfg @@ -70,6 +70,7 @@ failovermethod=priority name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros [testing] name=epel-testing diff --git a/el7t55.cfg b/el7t55.cfg index bd13cbb..fdb031b 100644 --- a/el7t55.cfg +++ b/el7t55.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7t56.cfg b/el7t56.cfg index 4e1fc1f..4312295 100644 --- a/el7t56.cfg +++ b/el7t56.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7x.cfg b/el7x.cfg index 1fca766..a5da964 100644 --- a/el7x.cfg +++ b/el7x.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7x55.cfg b/el7x55.cfg index 8fb5b6d..42d9b23 100644 --- a/el7x55.cfg +++ b/el7x55.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7x56.cfg b/el7x56.cfg index 2d95919..73d96d8 100644 --- a/el7x56.cfg +++ b/el7x56.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7x70.cfg b/el7x70.cfg index dbaf694..bb1a309 100644 --- a/el7x70.cfg +++ b/el7x70.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7x71.cfg b/el7x71.cfg index 8807a12..a95d18f 100644 --- a/el7x71.cfg +++ b/el7x71.cfg @@ -73,6 +73,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xscl54.cfg b/el7xscl54.cfg index a59f6d3..3a9cc08 100644 --- a/el7xscl54.cfg +++ b/el7xscl54.cfg @@ -73,6 +73,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xscl55.cfg b/el7xscl55.cfg index e213631..cc03151 100644 --- a/el7xscl55.cfg +++ b/el7xscl55.cfg @@ -73,6 +73,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xscl56.cfg b/el7xscl56.cfg index 6633928..9e0d59a 100644 --- a/el7xscl56.cfg +++ b/el7xscl56.cfg @@ -73,6 +73,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xscl70.cfg b/el7xscl70.cfg index 3fcbe18..383a874 100644 --- a/el7xscl70.cfg +++ b/el7xscl70.cfg @@ -73,6 +73,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xscl71.cfg b/el7xscl71.cfg index 40627e5..d01b967 100644 --- a/el7xscl71.cfg +++ b/el7xscl71.cfg @@ -76,6 +76,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] diff --git a/el7xt.cfg b/el7xt.cfg index c6074ad..4aa1996 100644 --- a/el7xt.cfg +++ b/el7xt.cfg @@ -70,6 +70,7 @@ enabled=0 name=epel mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 failovermethod=priority +exclude=epel-rpm-macros enabled=1 [epel-testing] -- cgit