From 6f07538cdc2c1fe373ba11490eb0851a147e428e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 22 Apr 2024 11:49:06 +0200 Subject: [PATCH] mirror: apparently the 'icons' dir does not always exist https://apt.izzysoft.de/fdroid/archive/com.futsch1.medtimer_28.apk: 2024-04-21 18:55:20 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.hardbacknutter.nevertoomanybooks_75.apk: 2024-04-21 18:55:20 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.jovial.jrpn15_20.apk: 2024-04-21 18:55:20 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.jovial.jrpn2_20.apk: 2024-04-21 18:55:20 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.logger.app_8.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.lorenzovainigli.foodexpirationdates.foss_22.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.openathena_36.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.oppzippy.openscq30_21.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.sanmer.mrepo_713.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/com.starry.myne_325.apk: 2024-04-21 18:55:21 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/dev.imranr.obtainium_22602.apk: 2024-04-21 18:55:22 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/dev.sanmer.pi_137.apk: 2024-04-21 18:55:22 ERROR 404: Not Found. https://apt.izzysoft.de/fdroid/archive/org.breezyweather_50108.apk: 2024-04-21 18:55:22 ERROR 404: Not Found. 2024-04-21 18:55:22,448 ERROR: no "icon" in org.breezyweather 2024-04-21 18:55:22,449 ERROR: no "icon" in com.lorenzovainigli.foodexpirationdates.foss 2024-04-21 18:55:22,449 ERROR: no "icon" in com.jovial.jrpn15 2024-04-21 18:55:22,450 ERROR: no "icon" in com.jovial.jrpn2 2024-04-21 18:55:22,450 ERROR: no "icon" in com.logger.app 2024-04-21 18:55:22,450 ERROR: no "icon" in com.futsch1.medtimer 2024-04-21 18:55:22,451 ERROR: no "icon" in com.sanmer.mrepo 2024-04-21 18:55:22,451 ERROR: no "icon" in com.starry.myne 2024-04-21 18:55:22,451 ERROR: no "icon" in com.hardbacknutter.nevertoomanybooks 2024-04-21 18:55:22,452 ERROR: no "icon" in dev.imranr.obtainium 2024-04-21 18:55:22,452 ERROR: no "icon" in com.openathena 2024-04-21 18:55:22,453 ERROR: no "icon" in com.oppzippy.openscq30 2024-04-21 18:55:22,453 ERROR: no "icon" in dev.sanmer.pi 2024-04-21 18:55:22,454 CRITICAL: Unknown exception found! Traceback (most recent call last): File "/home/fdroid/code/fdroid/fdroidserver/fdroid", line 22, in fdroidserver.__main__.main() File "/home/fdroid/code/fdroid/fdroidserver/fdroidserver/__main__.py", line 230, in main raise e File "/home/fdroid/code/fdroid/fdroidserver/fdroidserver/__main__.py", line 211, in main mod.main() File "/home/fdroid/code/fdroid/fdroidserver/fdroidserver/mirror.py", line 269, in main _run_wget(os.path.join(basedir, section, icondir), urls[icondir]) KeyError: 'icons' --- fdroidserver/mirror.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py index 224fcc5a..89e5ed66 100644 --- a/fdroidserver/mirror.py +++ b/fdroidserver/mirror.py @@ -268,7 +268,8 @@ def main(): urls[icondir].append(url) for icondir in icondirs: - _run_wget(os.path.join(basedir, section, icondir), urls[icondir]) + if icondir in urls: + _run_wget(os.path.join(basedir, section, icondir), urls[icondir]) if __name__ == "__main__":