From e0d65a567b35fe8627e18465ce15d77675b0c536 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 23 Oct 2017 15:15:49 +0000 Subject: [PATCH] Simplify comps Signed-off-by: Patrick Uiterwijk --- roles/bodhi2/backend/files/pungi.rpm.conf.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/roles/bodhi2/backend/files/pungi.rpm.conf.j2 b/roles/bodhi2/backend/files/pungi.rpm.conf.j2 index 4556e7a32e..d974c604d1 100644 --- a/roles/bodhi2/backend/files/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/files/pungi.rpm.conf.j2 @@ -11,13 +11,7 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': None, # defaults to cvs/HEAD or git/master - {% if release.version_int == 6 %} - 'file': 'comps-el6.xml', - {% elif release.version_int == 7 %} - 'file': 'comps-epel7.xml', - {% else %} - 'file': 'comps-f{{ release.version_int }}.xml', - {% endif %} + 'file': 'comps-{{ release.branch }}.xml', 'command': 'make', } variants_file='variants-fedora.xml'