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 multiple flavours in parse_androidmanifests

Browse source 
Previously only the last flavour was checked.
This commit is contained in:
Jochen Sprickerhof 2021-07-24 20:28:50 +02:00
parent 1ad0e7689a
commit 331b4830dd
4 changed files with 135 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -1691,11 +1691,11 @@ def parse_androidmanifests(paths, app):
vercode = None
package = None
flavour = None
flavours = None
temp_app_id = None
temp_version_name = None
if len(app.get('Builds', [])) > 0 and 'gradle' in app['Builds'][-1] and app['Builds'][-1].gradle:
flavour = app['Builds'][-1].gradle[-1]
flavours = app['Builds'][-1].gradle
if path.endswith('.gradle') or path.endswith('.gradle.kts'):
with open(path, 'r', encoding='utf-8') as f:
@ -1753,12 +1753,14 @@ def parse_androidmanifests(paths, app):
inside_required_flavour -= 1
if inside_required_flavour == 1:
inside_required_flavour -= 1
else:
if flavour:
elif flavours:
for flavour in flavours:
if re.match(r'.*[\'"\s]{flavour}[\'"\s].*\{{.*'.format(flavour=flavour), line):
inside_required_flavour = 2
break
elif re.match(r'.*[\'"\s]{flavour}[\'"\s].*'.format(flavour=flavour), line):
inside_required_flavour = 1
break
if '{' in line:
inside_flavour_group += 1