From b1bd22b20e3d38cda008955c8d43be9d9eeeea8f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 17 Aug 2016 13:23:15 +0530 Subject: [PATCH] Fix dupes being generated when uploading to fosshub --- setup/upload.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup/upload.py b/setup/upload.py index 2367d5bbf7..f552ad2a49 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -124,9 +124,9 @@ def run_remote_upload(args): # }}} -def upload_to_fosshub(files=None): - if files is None: - files = set(installers()) +def upload_to_fosshub(): + # fosshub has no API to do partial uploads, so we always upload all files. + files = set(installers()) entries = [] for fname in files: desc = installer_description(fname) @@ -136,7 +136,8 @@ def upload_to_fosshub(files=None): 'type': desc, 'version': __version__, }) - jq = {'software': 'Calibre', 'apiKey':get_fosshub_data(), 'upload':entries} + jq = {'software': 'Calibre', 'apiKey':get_fosshub_data(), 'upload':entries, 'delete':[{'type':'*', 'version':'*', 'name':'*'}]} + # print(json.dumps(jq, indent=2)) rq = urllib2.urlopen('https://www.fosshub.com/JSTools/uploadJson', urllib.urlencode({'content':json.dumps(jq)})) resp = rq.read() if rq.getcode() != httplib.OK: @@ -149,6 +150,7 @@ class UploadInstallers(Command): # {{{ parser.add_option('--replace', default=False, action='store_true', help='Replace existing installers') def run(self, opts): + # return upload_to_fosshub() all_possible = set(installers()) available = set(glob.glob('dist/*')) files = {x:installer_description(x) for x in @@ -168,7 +170,7 @@ class UploadInstallers(Command): # {{{ upload_signatures() check_call('ssh code /apps/update-calibre-version.py'.split()) # self.upload_to_sourceforge() - upload_to_fosshub(files) + upload_to_fosshub() self.upload_to_github(opts.replace) finally: shutil.rmtree(tdir, ignore_errors=True)