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

apksigner search should use MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2020-10-14 16:43:24 +02:00
parent 48e11ea3f1
commit b5cd850abe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/common.py
View File

@ -423,7 +423,8 @@ def find_apksigner():
Returns the best version of apksigner following this algorithm: Returns the best version of apksigner following this algorithm:
* use config['apksigner'] if set * use config['apksigner'] if set
* try to find apksigner in path * try to find apksigner in path
* find apksigner in build-tools starting from newest installed going down to MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION * find apksigner in build-tools starting from newest installed
going down to MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION
:return: path to apksigner or None if no version is found :return: path to apksigner or None if no version is found
""" """
if set_command_in_config('apksigner'): if set_command_in_config('apksigner'):
@ -434,7 +435,7 @@ 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_AAPT_BUILD_TOOLS_VERSION): if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
return None return None
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')