mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

makebuildserver: make copy_caches_from_host do rsync like fdroid build

Browse source 
This rsync hung because of an SSH unknown key prompt.  Since this is just
the vm host sshing to the vm guest, it is not essential to check the host
keys.
This commit is contained in:
Hans-Christoph Steiner 2017-12-06 09:47:08 +01:00
parent a0a68c7a13
commit 964ef996a0
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
makebuildserver
View file

@ -553,10 +553,16 @@ def main():
for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
fullpath = os.path.join(os.getenv('HOME'), d)
if os.path.isdir(fullpath):
# TODO newer versions of vagrant provide `vagrant rsync`
ssh_command = ' '.join('ssh -i {0} -p {1}'.format(key, port),
'-o StrictHostKeyChecking=no',
'-o UserKnownHostsFile=/dev/null',
'-o LogLevel=FATAL',
'-o IdentitiesOnly=yes',
'-o PasswordAuthentication=no')
# TODO vagrant 1.5+ provides `vagrant rsync`
run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',
'ssh -i {0} -p {1} -oIdentitiesOnly=yes'.format(key, port),
ssh_command,
fullpath + '/',
user + '@' + hostname + ':~/' + d + '/'])