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

make get_android_tools_versions() search ndk_paths from config

Browse source
This commit is contained in:
Hans-Christoph Steiner 2021-05-26 17:35:39 +02:00
parent 7a1d236c8d
commit 09fa49a7a3
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/common.py
View file

@ -3872,7 +3872,7 @@ def get_wiki_timestamp(timestamp=None):
return time.strftime("%Y-%m-%d %H:%M:%SZ", timestamp)
def get_android_tools_versions(ndk_path=None):
def get_android_tools_versions():
'''get a list of the versions of all installed Android SDK/NDK components'''
global config
@ -3880,11 +3880,9 @@ def get_android_tools_versions(ndk_path=None):
if sdk_path[-1] != '/':
sdk_path += '/'
components = []
if ndk_path:
ndk_release_txt = os.path.join(ndk_path, 'RELEASE.TXT')
if os.path.isfile(ndk_release_txt):
with open(ndk_release_txt, 'r') as fp:
components.append((os.path.basename(ndk_path), fp.read()[:-1]))
for ndk_path in config.get('ndk_paths', []):
version = get_ndk_version(ndk_path)
components.append((os.path.basename(ndk_path), str(version)))
pattern = re.compile(r'^Pkg.Revision *= *(.+)', re.MULTILINE)
for root, dirs, files in os.walk(sdk_path):
@ -3898,10 +3896,10 @@ def get_android_tools_versions(ndk_path=None):
return components
def get_android_tools_version_log(ndk_path=None):
def get_android_tools_version_log():
'''get a list of the versions of all installed Android SDK/NDK components'''
log = '== Installed Android Tools ==\n\n'
components = get_android_tools_versions(ndk_path)
components = get_android_tools_versions()
for name, version in sorted(components):
log += '* ' + name + ' (' + version + ')\n'