From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 22 Apr 2017 19:52:10 +0000 (+0200)
Subject: bintray.py: put release rpms to the right directory
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cde5b070fe33650395e740f956185528d3dad304;p=thirdparty%2Ftvheadend.git

bintray.py: put release rpms to the right directory
---

diff --git a/support/bintray.py b/support/bintray.py
index 03115f59b..cb3a8af2f 100755
--- a/support/bintray.py
+++ b/support/bintray.py
@@ -106,9 +106,11 @@ def get_ver(version):
       rest = ''
     return (major, minor, rest, git)
 
-def get_path(version):
+def get_path(version, repo):
     major, minor, rest, git = get_ver(version)
     if int(major) >= 4 and int(minor) & 1 == 0:
+        if repo in ['fedora', 'centos', 'rhel'] and git.find('~') > 0:
+            return '%s.%s-release' % (major, minor)
         return '%s.%s' % (major, minor)
     return 't'
 
@@ -147,7 +149,7 @@ def get_bintray_params(filename, hint=None):
         debname, debversion = debbase.split('_', 1)
         debversion, debdistro = debversion.rsplit('~', 1)
         args.version = debversion
-        args.path = 'pool/' + get_path(debversion) + '/' + args.package
+        args.path = 'pool/' + get_path(debversion, args.repo) + '/' + args.package
         extra.append('deb_component=' + get_component(debversion))
         extra.append('deb_distribution=' + debdistro)
         extra.append('deb_architecture=' + debarch)
@@ -161,7 +163,7 @@ def get_bintray_params(filename, hint=None):
         rpmversion, rpmdist = rpmver2.split('.', 1)
         rpmversion = rpmver1 + '-' + rpmversion
         args.version = rpmversion
-        args.path = 'linux/' + get_path(rpmversion) + \
+        args.path = 'linux/' + get_path(rpmversion, args.repo) + \
                     '/' + rpmdist + '/' + rpmarch
     extra = ';'.join(extra)
     if extra: extra = ';' + extra