From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 21 Apr 2017 08:36:37 +0000 (+0200)
Subject: bintray.py: show the backtrace when the filename is not parsed correctly, fix compone... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b1d6d8d652cfb48d4729d36c6b2dba0da3cf61;p=thirdparty%2Ftvheadend.git

bintray.py: show the backtrace when the filename is not parsed correctly, fix component version
---

diff --git a/support/bintray.py b/support/bintray.py
index 81ad4e5db..03115f59b 100755
--- a/support/bintray.py
+++ b/support/bintray.py
@@ -8,6 +8,7 @@ import os
 import sys
 import json
 import base64
+import traceback
 try:
     # Python 3
     import urllib.request as urllib
@@ -95,26 +96,28 @@ def do_upload(*args):
 
 def get_ver(version):
     if version.find('-'):
-        version, _ = version.split('-', 1)
+        version, git = version.split('-', 1)
+    else:
+        git = None
     try:
       major, minor, rest = version.split('.', 2)
     except:
       major, minor = version.split('.', 1)
       rest = ''
-    return (major, minor, rest)
+    return (major, minor, rest, git)
 
 def get_path(version):
-    major, minor, rest = get_ver(version)
+    major, minor, rest, git = get_ver(version)
     if int(major) >= 4 and int(minor) & 1 == 0:
-        return '%d.%d' % (major, minor)
+        return '%s.%s' % (major, minor)
     return 't'
 
 def get_component(version):
-    major, minor, rest = get_ver(version)
+    major, minor, rest, git = get_ver(version)
     if int(major) >= 4 and int(minor) & 1 == 0:
-        if rest.find('~') > 0:
-            return 'stable-%d.%d' % (major, minor)
-        return 'release-%d.%d' % (major, minor)
+        if git.find('~') > 0:
+            return 'stable-%s.%s' % (major, minor)
+        return 'release-%s.%s' % (major, minor)
     return 'unstable'
 
 def get_repo(filename, hint=None):
@@ -188,6 +191,12 @@ def do_publish(*args):
             break
         except:
             pass
+    if not args:
+        for file in files:
+            try:
+                basename, args, extra = get_bintray_params(file)
+            except:
+                traceback.print_exc()
     bpath = '/packages/tvheadend/%s/tvheadend/versions' % args.repo
     data = { 'name': args.version, 'desc': PACKAGE_DESC }
     resp = Bintray(bpath).post(data)