update: do not replace Name/Summary from template unless blank

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index b453d813ecd550f7054563686fa1620bea97f5fd..831eede3dc198c42e9d3ff75dddc579092b8fed8 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -179,7 +179,7 @@ cachefiles = [
     ('https://dl.google.com/android/repository/platform-26_r02.zip',
      '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
     ('https://dl.google.com/android/repository/platform-27_r01.zip',
-     'cbba6f8fcf025e1b533326746763aa1d6e2cf4001b1b441602bb44d253bc49ac'),
+     '96ddff1a5034fcc4340f2d482635eeaccaa6707b6b0f82d26d1435476a2f52e5'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -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',