Normalise relative paths (e.g. @..)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 89c52f7113e9c5f64b83af2479579f996750682d..2dada68c390ba0ee3693e4a3ba266f3a9383b72c 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -395,6 +395,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         if '@' in thisbuild['maven']:
             maven_dir = os.path.join(root_dir, thisbuild['maven'].split('@',1)[1])
+            maven_dir = os.path.normpath(maven_dir)
         else:
             maven_dir = root_dir
 
@@ -405,6 +406,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         if '@' in thisbuild['gradle']:
             gradle_dir = os.path.join(root_dir, thisbuild['gradle'].split('@',1)[1])
+            gradle_dir = os.path.normpath(gradle_dir)
         else:
             gradle_dir = root_dir