mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pep8 warnings in makebuildserver

Browse source
This commit is contained in:
Daniel Martí 2014-05-31 23:00:27 +02:00
parent b594558811
commit e5854b7e13
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
makebuildserver
View file

@ -60,6 +60,7 @@ if options.clean:
cachedir = os.path.join('buildserver', 'cache') cachedir = os.path.join('buildserver', 'cache')
if not os.path.exists(cachedir): if not os.path.exists(cachedir):
os.mkdir(cachedir) os.mkdir(cachedir)
cachefiles = [ cachefiles = [
('android-sdk_r22.6-linux.tgz', ('android-sdk_r22.6-linux.tgz',
'https://dl.google.com/android/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', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
'0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1') '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')
] ]
if config['arch64']: if config['arch64']:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r9b-linux-x86_64.tar.bz2', ('android-ndk-r9b-linux-x86_64.tar.bz2',
'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'), '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2', ('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', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')]) 'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
else: else:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r9b-linux-x86.tar.bz2', ('android-ndk-r9b-linux-x86.tar.bz2',
'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
'748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'), '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2', ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
'https://dl.google.com/android/ndk/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')]) '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
wanted = [] wanted = []
@ -210,7 +212,7 @@ buildserverid = p.communicate()[0].strip()
print "...ID is " + buildserverid print "...ID is " + buildserverid
subprocess.call( subprocess.call(
['vagrant', 'ssh', '-c', 'sh -c "echo {0} >/home/vagrant/buildserverid"' ['vagrant', 'ssh', '-c', 'sh -c "echo {0} >/home/vagrant/buildserverid"'
.format(buildserverid)], .format(buildserverid)],
cwd=serverdir) cwd=serverdir)
print "Stopping build server VM" print "Stopping build server VM"