From 0e37a18d8354dac87dfa8ecc953256ed5b980fd5 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 7 Dec 2017 11:52:10 +0100
Subject: [PATCH] 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 964ef996a01ceac8d6735668f2c9fd9119512346
---
 makebuildserver | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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',
-- 
2.30.2