Only expand paths on config items that can actually be paths

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 373eefc714c5c4bc8d75ab47e370dcfed795b85a..52a3bf72be951ad906285523b5fae6d0033ade14 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -79,10 +79,9 @@ def fill_config_defaults(config):
         if k not in config:
             config[k] = v
 
-    # Expand environment variables
-    for k, v in config.items():
-        if type(v) != str:
-            continue
+    # Expand paths (~users and $vars)
+    for k in ['sdk_path', 'ndk_path', 'ant', 'mvn3', 'gradle', 'keystore', 'repo_icon']:
+        v = config[k]
         orig = v
         v = os.path.expanduser(v)
         v = os.path.expandvars(v)