Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor for DRYness

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-22 13:39:35 +05:30
parent 8982e9d52c
commit 8208bb5171
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
setup/hosting.py
View File

@ -513,7 +513,18 @@ def upload_to_dbs(files, version): # {{{
sys.stdout.flush() sys.stdout.flush()
server = 'mirror10.fosshub.com' server = 'mirror10.fosshub.com'
rdir = 'release/' rdir = 'release/'
old_files = set(check_output(['ssh', 'kovid@' + server, 'ls ' + rdir]).decode('utf-8').split()) def run_ssh(command, func=check_call):
cmd = ['ssh', '-x', 'kovid@%s' % server, command]
try:
return func(cmd)
except CalledProcessError as err:
# fosshub is being a little flaky sshing into it is failing the first
# time, needing a retry
if err.returncode != 255:
raise
return func(cmd)
old_files = set(run_ssh('ls ' + rdir, func=check_output).decode('utf-8').split())
if len(files) < 7: if len(files) < 7:
existing = set(map(os.path.basename, files)) existing = set(map(os.path.basename, files))
# fosshub does not support partial re-uploads # fosshub does not support partial re-uploads
@ -540,17 +551,10 @@ def upload_to_dbs(files, version): # {{{
break break
print ('Uploaded in', int(time.time() - start), 'seconds\n\n') print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
sys.stdout.flush() sys.stdout.flush()
if old_files: if old_files:
check_call(['ssh', 'kovid@' + server, 'rm -f %s' % (' '.join(rdir + x for x in old_files))]) run_ssh('rm -f %s' % (' '.join(rdir + x for x in old_files)))
try: run_ssh('/home/kovid/uploadFiles')
check_call(['ssh', 'kovid@%s' % server, '/home/kovid/uploadFiles'])
except CalledProcessError as err:
# fosshub is being a little flaky sshing into it is failing the first
# time, needing a retry
if err.returncode == 255:
check_call(['ssh', 'kovid@%s' % server, '/home/kovid/uploadFiles'])
else:
raise
# }}} # }}}
# CLI {{{ # CLI {{{