mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'fix_type_error' into 'master'
Fix type error See merge request fdroid/fdroidserver!835
This commit is contained in:
commit
02b3024767
@ -480,10 +480,13 @@ def find_apksigner():
|
|||||||
if not os.path.isdir(build_tools_path):
|
if not os.path.isdir(build_tools_path):
|
||||||
return None
|
return None
|
||||||
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)) or not isinstance(LooseVersion(f), int):
|
if not os.path.isdir(os.path.join(build_tools_path, f)):
|
||||||
continue
|
continue
|
||||||
|
try:
|
||||||
if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
|
if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
|
||||||
return None
|
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user