mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also fix local.prop files before subdir

Browse source 
If subdir=foo/bar and there is a foo/local.properties file, it would not
get treated.
This commit is contained in:
Daniel Martí 2015-10-26 16:49:11 +01:00
parent d141bd1be0
commit 37b13c37d5
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -1283,7 +1283,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
# Update the local.properties file # Update the local.properties file
localprops = [os.path.join(build_dir, 'local.properties')] localprops = [os.path.join(build_dir, 'local.properties')]
if build['subdir']: 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: for path in localprops:
props = "" props = ""
if os.path.isfile(path): if os.path.isfile(path):