doozer: try to fix centos build

diff --git a/.doozer.json b/.doozer.json
index 1b6790496f4512b8db384695e75226a334670e17..8a890608b1398fbf8a7b8cc2b42551df6c4f4b08 100644 (file)
--- a/.doozer.json
+++ b/.doozer.json
@@ -400,7 +400,7 @@
       ],
       "buildcmd": [
         "./configure --disable-dvbscan && make -C rpm build-doozer",
-        "support/bintray.py publish filelist.txt",
+        "BINTRAY_REPO=centos support/bintray.py publish filelist.txt",
       ]
     },
     "bionic-amd64": {

diff --git a/support/bintray.py b/support/bintray.py
index 56db6ad7d287356ae4af024d3aa02e4b61c1ad6e..dc0461ae7dbe565196d1e45cc3117c6ed27a392b 100755 (executable)
--- a/support/bintray.py
+++ b/support/bintray.py
@@ -27,6 +27,7 @@ DEBUG=False
 BINTRAY_API='https://bintray.com/api/v1'
 BINTRAY_USER=env('BINTRAY_USER')
 BINTRAY_PASS=env('BINTRAY_PASS')
+BINTRAY_REPO=env('BINTRAY_REPO')
 BINTRAY_COMPONENT=env('BINTRAY_COMPONENT')
 BINTRAY_ORG=env('BINTRAY_ORG') or 'tvheadend'
 BINTRAY_PACKAGE='tvheadend'
@@ -134,6 +135,7 @@ def get_component(version):
 
 def get_repo(filename, hint=None):
     if hint: return hint
+    if BINTRAY_REPO: return BINTRAY_REPO
     name, ext = os.path.splitext(filename)
     if ext == '.deb':
         return 'deb'
@@ -235,8 +237,8 @@ def do_publish(*args):
         data = open(file, 'rb').read()
         resp = Bintray(bpath).put(data, binary=1)
         if resp.code != 200 and resp.code != 201:
-            error(10, 'File %s: HTTP ERROR "%s" %s',
-                      file, resp.code, resp.reason)
+            error(10, 'File %s (%s): HTTP ERROR "%s" %s',
+                      file, bpath, resp.code, resp.reason)
         else:
             info('File %s: uploaded', file)