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

Ignore non version number entries in build_tools_path

Browse source 
LooseVersion('debian') stay a string and results in a type error.
This commit is contained in:
Jochen Sprickerhof 2020-11-29 19:04:35 +01:00
parent 4d78d79280
commit 25b1f3fe8c
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/common.py
View file

@ -482,8 +482,11 @@ def find_apksigner():
for f in sorted(os.listdir(build_tools_path), reverse=True): for f in sorted(os.listdir(build_tools_path), reverse=True):
if not os.path.isdir(os.path.join(build_tools_path, f)): if not os.path.isdir(os.path.join(build_tools_path, f)):
continue continue
if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION): try:
return None if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
return None
except TypeError:
continue
if os.path.exists(os.path.join(build_tools_path, f, 'apksigner')): if os.path.exists(os.path.join(build_tools_path, f, 'apksigner')):
apksigner = os.path.join(build_tools_path, f, 'apksigner') apksigner = os.path.join(build_tools_path, f, 'apksigner')
logging.info("Using %s " % apksigner) logging.info("Using %s " % apksigner)