From e5854b7e1374353e99c001df43b8a3ecfb5de90c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 31 May 2014 23:00:27 +0200 Subject: [PATCH] Fix pep8 warnings in makebuildserver --- makebuildserver | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/makebuildserver b/makebuildserver index 5b5e4bdd..38cbc013 100755 --- a/makebuildserver +++ b/makebuildserver @@ -60,6 +60,7 @@ 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', @@ -92,22 +93,23 @@ cachefiles = [ 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', '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 = [] @@ -210,7 +212,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" -- 2.30.2