Apply some autopep8-python2 suggestions

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 5b5e4bddac0c47ef9a20757189123fe83c14230d..6dc317dcac9888680c7806fe34f86be4bfb3ce50 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -60,10 +60,11 @@ if options.clean:
 cachedir = os.path.join('buildserver', 'cache')
 if not os.path.exists(cachedir):
     os.mkdir(cachedir)
+
 cachefiles = [
-    ('android-sdk_r22.6-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r22.6-linux.tgz',
-     'da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f'),
+    ('android-sdk_r24.0.1-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz',
+     'bb3754524a8f6700c2898617c9d8836a987a8aa43d0e922885cd7a98ca79b281'),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
@@ -88,26 +89,33 @@ cachefiles = [
     ('gradle-1.12-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.12-bin.zip',
      '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'),
+    ('gradle-2.1-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.1-bin.zip',
+     '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'),
+    ('gradle-2.2.1-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
+     '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
-     '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')
-    ]
+     '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
+]
+
 if config['arch64']:
     cachefiles.extend([
-    ('android-ndk-r9b-linux-x86_64.tar.bz2',
-     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
-     '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
-    ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
+        ('android-ndk-r9b-linux-x86_64.tar.bz2',
+         'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
+         '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
+        ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
+         'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
+         'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
 else:
     cachefiles.extend([
-    ('android-ndk-r9b-linux-x86.tar.bz2',
-     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
-     '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
-    ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
-     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
-     '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
+        ('android-ndk-r9b-linux-x86.tar.bz2',
+         'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
+         '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
+        ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
+         'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
+         '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
 wanted = []
 
 
@@ -142,12 +150,14 @@ for f, src, shasum in cachefiles:
 # Generate an appropriate Vagrantfile for the buildserver, based on our
 # settings...
 vagrantfile = """
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
 
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"
 
-  config.vm.customize ["modifyvm", :id, "--memory", "{2}"]
+  config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--memory", "{2}"]
+  end
 
   config.vm.provision :shell, :path => "fixpaths.sh"
 """.format(config['basebox'], config['baseboxurl'], config['memory'])
@@ -210,7 +220,7 @@ buildserverid = p.communicate()[0].strip()
 print "...ID is " + buildserverid
 subprocess.call(
     ['vagrant', 'ssh', '-c', 'sh -c "echo {0} >/home/vagrant/buildserverid"'
-    .format(buildserverid)],
+        .format(buildserverid)],
     cwd=serverdir)
 
 print "Stopping build server VM"