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

Check if build_tools path exists before listdir

Browse Source
This commit is contained in:
Jochen Sprickerhof 2020-11-29 10:02:30 +01:00
parent 1c7df94e76
commit ce10fcb759
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdroidserver/common.py
View File

@ -498,9 +498,10 @@ def find_sdk_tools_cmd(cmd):
if config is not None and 'sdk_path' in config and os.path.exists(config['sdk_path']):
# try to find a working path to this command, in all the recent possible paths
build_tools = os.path.join(config['sdk_path'], 'build-tools')
for f in sorted(os.listdir(build_tools), reverse=True):
if os.path.isdir(os.path.join(build_tools, f)):
tooldirs.append(os.path.join(build_tools, f))
if os.path.isdir(build_tools):
for f in sorted(os.listdir(build_tools), reverse=True):
if os.path.isdir(os.path.join(build_tools, f)):
tooldirs.append(os.path.join(build_tools, f))
sdk_tools = os.path.join(config['sdk_path'], 'tools')
if os.path.exists(sdk_tools):
tooldirs.append(sdk_tools)