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

Revert "Merge branch 'random-fixes' into 'master'"

Browse source 
This reverts merge request !605
This commit is contained in:
Marcus 2019-01-10 13:46:49 +00:00
parent 357dea762d
commit f6f2fb0b89
6 changed files with 8 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/index.py
View file

@ -686,7 +686,7 @@ def get_mirror_service_urls(url):
return urls
def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600):
def download_repo_index(url_str, etag=None, verify_fingerprint=True):
"""Downloads and verifies index file, then returns its data.
Downloads the repository index from the given :param url_str and
@ -710,7 +710,7 @@ def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600
fingerprint = query['fingerprint'][0]
url = urllib.parse.SplitResult(url.scheme, url.netloc, url.path + '/index-v1.jar', '', '')
download, new_etag = net.http_get(url.geturl(), etag, timeout)
download, new_etag = net.http_get(url.geturl(), etag)
if download is None:
return None, new_etag