kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 18:50:11 +02:00
Code Activity

update: skip APKs that cannot be parsed instead of exiting

Browse Source 
Some APKs can be corrupt or some system APKs do not have all the normal
info.  Instead of quitting, `fdroid update` skips the non-parsable APKs and
optionally deletes them if --delete-unknown is specified.
This commit is contained in:
Hans-Christoph Steiner 2014-06-02 16:18:12 -04:00
parent ed73db65ae
commit 57a4e03277
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdroidserver/update.py
View File

@ -379,8 +379,15 @@ def scan_apks(apps, apkcache, repodir, knownapks):
config['build_tools'], 'aapt'), config['build_tools'], 'aapt'),
'dump', 'badging', apkfile]) 'dump', 'badging', apkfile])
if p.returncode != 0: if p.returncode != 0:
logging.critical("Failed to get apk information") if options.delete_unknown:
sys.exit(1) if os.path.exists(apkfile):
logging.error("Failed to get apk information, deleting " + apkfile)
os.remove(apkfile)
else:
logging.error("Could not find {0} to remove it".format(apkfile))
else:
logging.error("Failed to get apk information, skipping " + apkfile)
continue
for line in p.stdout.splitlines(): for line in p.stdout.splitlines():
if line.startswith("package:"): if line.startswith("package:"):
try: try: