X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=makebuildserver;h=831eede3dc198c42e9d3ff75dddc579092b8fed8;hb=0e37a18d8354dac87dfa8ecc953256ed5b980fd5;hp=744fef52a9acb18aab3775d279ef09a1d4830b7d;hpb=8ffed8750c5ad0c2993f93cd5aa73526ecc39110;p=fdroidserver.git diff --git a/makebuildserver b/makebuildserver index 744fef52..831eede3 100755 --- a/makebuildserver +++ b/makebuildserver @@ -553,12 +553,12 @@ 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): - 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') + 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',