From c8b417bf4ad2474c45eba917136539d1aaf52fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 7 Dec 2013 13:20:22 +0100
Subject: [PATCH] Expand vars properly

---
 fdroidserver/common.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 3b524e9e..58d024a5 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -77,8 +77,7 @@ def read_config(opts, config_file='config.py'):
     for k, v in config.items():
         if type(v) != str:
             continue
-        if v[0] == '$':
-            config[k] = os.environ[v[1:]]
+        config[k] = os.path.expandvars(v)
 
     # Check that commands and binaries do exist
     for key in ('mvn3', 'gradle'):