From: relan <email@hidden>
Date: Wed, 3 Aug 2016 05:21:46 +0000 (+0300)
Subject: Fix JAVA_HOME environment variable handling
X-Git-Tag: 0.7.0~14^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=07660fdb13722ae8377432e2bac14b9cee862c2d

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 d8defcb8..229c6e4d 100644
--- 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):