mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
makebuildserver: fix join() syntax error, it needs a list/tuple
If only there was a way to test this without taking hours to run...
fixes 964ef996a0
This commit is contained in:
parent
8ffed8750c
commit
0e37a18d83
@ -553,12 +553,12 @@ def main():
|
|||||||
for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
|
for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
|
||||||
fullpath = os.path.join(os.getenv('HOME'), d)
|
fullpath = os.path.join(os.getenv('HOME'), d)
|
||||||
if os.path.isdir(fullpath):
|
if os.path.isdir(fullpath):
|
||||||
ssh_command = ' '.join('ssh -i {0} -p {1}'.format(key, port),
|
ssh_command = ' '.join(('ssh -i {0} -p {1}'.format(key, port),
|
||||||
'-o StrictHostKeyChecking=no',
|
'-o StrictHostKeyChecking=no',
|
||||||
'-o UserKnownHostsFile=/dev/null',
|
'-o UserKnownHostsFile=/dev/null',
|
||||||
'-o LogLevel=FATAL',
|
'-o LogLevel=FATAL',
|
||||||
'-o IdentitiesOnly=yes',
|
'-o IdentitiesOnly=yes',
|
||||||
'-o PasswordAuthentication=no')
|
'-o PasswordAuthentication=no'))
|
||||||
# TODO vagrant 1.5+ provides `vagrant rsync`
|
# TODO vagrant 1.5+ provides `vagrant rsync`
|
||||||
run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
|
run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
|
||||||
subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',
|
subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',
|
||||||
|
Loading…
Reference in New Issue
Block a user