1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00

makebuildserver: use https uris whenever available

* pypi now defaults to https
* dl.google.com works well with https
This commit is contained in:
Hans-Christoph Steiner 2014-01-30 20:33:37 -05:00
parent 2d6f3f8cec
commit 5cdb428a2f

View File

@ -61,7 +61,7 @@ if not os.path.exists(cachedir):
os.mkdir(cachedir)
cachefiles = [
('android-sdk_r22.3-linux.tgz',
'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
'https://dl.google.com/android/android-sdk_r22.3-linux.tgz',
'4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
('gradle-1.4-bin.zip',
'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
@ -82,24 +82,24 @@ cachefiles = [
'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
'6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
('Kivy-1.7.2.tar.gz',
'http://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')
]
if config['arch64']:
cachefiles.extend([
('android-ndk-r9b-linux-x86_64.tar.bz2',
'http://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'),
('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'http://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')])
else:
cachefiles.extend([
('android-ndk-r9b-linux-x86.tar.bz2',
'http://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'),
('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
'http://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')])
wanted = []