verify: if downloading from /repo/ fails, try /archive/

The Builds entries in metadata/ files do not easily say whether a
given APK is in the repo/ or the archive/.  So it should also try to
download the official APK from the archive/ when verifying.

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 966c3874fad2678fc3e48d29b8b4baf5698137d3..85d1d2b2f55f5b0fd86091ee5f1ae343db9f6763 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -80,7 +80,10 @@ def main():
             try:
                 net.download_file(url, dldir=tmp_dir)
             except requests.exceptions.HTTPError as e:
-                raise FDroidException('Downloading %s failed. %s', (url, e))
+                try:
+                    net.download_file(url.replace('/repo', '/archive/'), dldir=tmp_dir)
+                except requests.exceptions.HTTPError as e:
+                    raise FDroidException('Downloading %s failed. %s', (url, e))
 
             compare_result = common.verify_apks(
                 remoteapk,