mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support '{' in extra line in parse_androidmanifests

Browse source 
If the flavour group starts in a separate line don't count it as a
second group.

Closes: #899
This commit is contained in:
Jochen Sprickerhof 2021-06-13 00:49:41 +02:00
parent 0fefecde1e
commit 1e6de7eb34
4 changed files with 100 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/common.py
View file

@ -1649,7 +1649,7 @@ def parse_androidmanifests(paths, app):
temp_version_name = matches.group(2)
if inside_flavour_group > 0:
if inside_required_flavour > 0:
if inside_required_flavour > 1:
matches = psearch_g(line)
if matches:
s = matches.group(2)
@ -1678,14 +1678,19 @@ def parse_androidmanifests(paths, app):
if matches:
vercode = matches.group(1)
if inside_required_flavour > 0:
if '{' in line:
inside_required_flavour += 1
if '}' in line:
inside_required_flavour -= 1
if inside_required_flavour == 1:
inside_required_flavour -= 1
else:
if flavour and re.match(
r'.*[\'"\s]{flavour}[\'"\s].*'.format(flavour=flavour), line):
inside_required_flavour = 1
if flavour:
if re.match(r'.*[\'"\s]{flavour}[\'"\s].*\{{.*'.format(flavour=flavour), line):
inside_required_flavour = 2
elif re.match(r'.*[\'"\s]{flavour}[\'"\s].*'.format(flavour=flavour), line):
inside_required_flavour = 1
if '{' in line:
inside_flavour_group += 1