From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 15 Sep 2014 10:39:42 +0000 (+0200)
Subject: Only expand paths on config items that can actually be paths
X-Git-Tag: 0.3.0~58
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=37aa3a7b9954501200a9e801d3c320c99b3d523a;p=fdroidserver.git

Only expand paths on config items that can actually be paths
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 373eefc7..52a3bf72 100644
--- 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)