From 47f99ffa1811a7a128646553ff8dd1fff5210531 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 5 Mar 2016 18:54:21 +0000 Subject: [PATCH] add a mapping for koji tags to pkgdb names for rawhide deal with fedora better Signed-off-by: Dennis Gilmore --- roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 index dfa539a01a..c13c6db0c5 100755 --- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 +++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 @@ -29,6 +29,7 @@ sys.path.append('.') import koji +rawhide = '25' extraArchList = {'kernel': ('i586', 'i686', 'noarch'), 'kernel-xen-2.6': ('i586', 'i686', 'noarch'), 'glibc': ('i686',), @@ -81,6 +82,8 @@ if __name__ == '__main__': if tag.startswith('epel'): version = tag.split('epel')[1] + elif tag.startswith('f'): + version = tag.split('f')[1] else: version = tag.split('-')[1][:-1] @@ -102,8 +105,11 @@ if __name__ == '__main__': reponame = 'el%s' % version arches = ["primary"] else: - # Fedora - reponame = tag + # Fedora + if version == rawhide: + reponame = 'master' + else: + reponame = tag {% if env == 'staging' %} arches = ["primary"] {% else %}