From df4748a667c720b4c4c13e2de785f46fca2e664e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 20 Jun 2018 09:41:20 +0200 Subject: [PATCH] doozer: try to fix centos build --- .doozer.json | 2 +- support/bintray.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.doozer.json b/.doozer.json index 1b6790496..8a890608b 100644 --- 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 56db6ad7d..dc0461ae7 100755 --- 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) -- 2.47.2