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

Fix issue where gradle=yes would be removed by rewritemeta

Browse source
This commit is contained in:
Daniel Martí 2014-09-15 17:03:45 +02:00
parent e038b4424c
commit ce61186cd2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -838,6 +838,8 @@ def manifest_paths(app_dir, flavours):
os.path.join(app_dir, 'build.gradle')] os.path.join(app_dir, 'build.gradle')]
for flavour in flavours: for flavour in flavours:
if flavour == 'yes':
continue
possible_manifests.append( possible_manifests.append(
os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml')) os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))

4
fdroidserver/metadata.py
View file

@ -603,8 +603,8 @@ def parse_metadata(metafile):
# Port legacy ';' separators # Port legacy ';' separators
pv = [v.strip() for v in pv.replace(';', ',').split(',')] pv = [v.strip() for v in pv.replace(';', ',').split(',')]
if pk == 'gradle': if pk == 'gradle':
if len(pv) == 1 and pv[0] in ['main', 'yes', '']: if len(pv) == 1 and pv[0] in ['main', 'yes']:
pv = [] pv = ['yes']
thisbuild[pk] = pv thisbuild[pk] = pv
elif t == 'string' or t == 'script': elif t == 'string' or t == 'script':
thisbuild[pk] = pv thisbuild[pk] = pv