From bcd31401ac03a79abc1c6f2561afd08b77ac1bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 26 Sep 2016 21:07:55 +0100 Subject: [PATCH] checkupdates: avoid crash with --auto and None CVC Reproducible via `fdroid checkupdates --auto subreddit.android.appstore` at fdroiddata HEAD (e76449ab). WARNING: ...subreddit.android.appstore : Couldn't find package ID CRITICAL: Unknown exception found! Traceback (most recent call last): File "/home/mvdan/.bin/fdroid", line 147, in main() File "/home/mvdan/.bin/fdroid", line 124, in main mod.main() File "/home/mvdan/git/fsr/fdroidserver/checkupdates.py", line 571, in main checkupdates_app(app) File "/home/mvdan/git/fsr/fdroidserver/checkupdates.py", line 469, in checkupdates_app if int(build.vercode) >= int(app.CurrentVersionCode): TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' --- fdroidserver/checkupdates.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index b754bf10..2cc21e56 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -452,7 +452,9 @@ def checkupdates_app(app, first=True): if options.auto: mode = app.AutoUpdateMode - if mode in ('None', 'Static'): + if not app.CurrentVersionCode: + logging.warn("Can't auto-update app with no current version code: " + app.id) + elif mode in ('None', 'Static'): pass elif mode.startswith('Version '): pattern = mode[8:]