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

Fix JAVA_HOME environment variable handling

Browse Source 
Append JAVA_HOME to pathlist as a string, not as a list of characters.
This commit is contained in:
relan 2016-08-03 08:21:46 +03:00
parent bf153ec247
commit 07660fdb13
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/common.py
View File

@ -135,7 +135,7 @@ def fill_config_defaults(thisconfig):
pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk') pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk')
pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*') pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*')
if os.getenv('JAVA_HOME') is not None: if os.getenv('JAVA_HOME') is not None:
pathlist += os.getenv('JAVA_HOME') pathlist.append(os.getenv('JAVA_HOME'))
if os.getenv('PROGRAMFILES') is not None: if os.getenv('PROGRAMFILES') is not None:
pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[6-9].*')) pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[6-9].*'))
for d in sorted(pathlist): for d in sorted(pathlist):