Fix JAVA_HOME environment variable handling

Append JAVA_HOME to pathlist as a string, not as a list of characters.

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index d8defcb8c0ec6e599e0d2966255d34b160d3254b..229c6e4d69cfbd462aba80f90df38d05b11d9a85 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -135,7 +135,7 @@ def fill_config_defaults(thisconfig):
         pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk')
         pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*')
         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:
             pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[6-9].*'))
         for d in sorted(pathlist):