mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fixFlavor' into 'master'

Browse source 
Regex only for flavor blocks: flavor { ... }

See merge request fdroid/fdroidserver!407
This commit is contained in:
Hans-Christoph Steiner 2017-12-14 16:56:01 +01:00
commit 61aac0503a
5 changed files with 159 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -1338,7 +1338,7 @@ def parse_androidmanifests(paths, app):
with open(path, 'r') as f:
buildfile = f.read()
regex_string = r"" + flavour + ".*?}"
regex_string = r"" + flavour + "[^}]*?{.*?}"
search = re.compile(regex_string, re.DOTALL)
result = search.search(buildfile)