Merge branch 'gradle-4.4' into 'master'

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index b453d813ecd550f7054563686fa1620bea97f5fd..1eff57f27496ce8b034a383750a155b43976afbc 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -336,6 +336,8 @@ cachefiles = [
      '8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c'),
     ('https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip',
      '15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4-bin.zip',
+     'fa4873ae2c7f5e8c02ec6948ba95848cedced6134772a0169718eadcb39e0a2f'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
@@ -553,15 +555,15 @@ 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',
+                subprocess.call(['rsync', '-ax', '--delete', '-e',
                                  ssh_command,
                                  fullpath + '/',
                                  user + '@' + hostname + ':~/' + d + '/'])