From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 26 Oct 2015 15:49:11 +0000 (+0100)
Subject: Also fix local.prop files before subdir
X-Git-Tag: 0.5.0~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=37b13c37d52af65bc9cdb0b51021ad77dee4104c;p=fdroidserver.git

Also fix local.prop files before subdir

If subdir=foo/bar and there is a foo/local.properties file, it would not
get treated.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index db2e0f09..d57f4c7e 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1283,7 +1283,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     # Update the local.properties file
     localprops = [os.path.join(build_dir, 'local.properties')]
     if build['subdir']:
-        localprops += [os.path.join(root_dir, 'local.properties')]
+        parts = build['subdir'].split(os.sep)
+        cur = build_dir
+        for d in parts:
+            cur = os.path.join(cur, d)
+            localprops += [os.path.join(cur, 'local.properties')]
     for path in localprops:
         props = ""
         if os.path.isfile(path):