From 37b13c37d52af65bc9cdb0b51021ad77dee4104c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 26 Oct 2015 16:49:11 +0100 Subject: [PATCH] Also fix local.prop files before subdir If subdir=foo/bar and there is a foo/local.properties file, it would not get treated. --- fdroidserver/common.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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): -- 2.30.2