build: fix --no-refresh

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index b453d813ecd550f7054563686fa1620bea97f5fd..7e9ce9bda6d77c7670c33fb33b60c2ace210c7f5 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -252,6 +252,8 @@ cachefiles = [
      '53d3322774a0bf229b372c0288108b4bfa27d74725fce8f0a3393e8df6b9ef22'),
     ('https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip',
      '2e8e0946e93af50667ae02ef200e81c1ac2269b59f14955397245e9e441e8b1e'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip',
+     'e73674e065a93ffb05c30a15c8021c0d72ea7c3c206eb9020eb93e49e42ce851'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -336,6 +338,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 +557,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 + '/'])