mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

always use androguard version of common.get_apk_id() first

Browse source 
This removes the need for common.use_androguard()
This commit is contained in:
Hans-Christoph Steiner 2020-10-14 16:53:59 +02:00
parent 27b90a13bf
commit 8fd7dcd425
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/common.py
View file

@ -2431,15 +2431,12 @@ def get_apk_id(apkfile):
:returns: triplet (appid, version code, version name) :returns: triplet (appid, version code, version name)
""" """
if use_androguard():
try: try:
return get_apk_id_androguard(apkfile) return get_apk_id_androguard(apkfile)
except zipfile.BadZipFile as e: except zipfile.BadZipFile as e:
logging.error(apkfile + ': ' + str(e)) logging.error(apkfile + ': ' + str(e))
if 'aapt' in config: if 'aapt' in config:
return get_apk_id_aapt(apkfile) return get_apk_id_aapt(apkfile)
else:
return get_apk_id_aapt(apkfile)
def get_apk_id_androguard(apkfile): def get_apk_id_androguard(apkfile):