Fix issue where gradle=yes would be removed by rewritemeta

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ba8080a70778ed7cf6668079f95b12363113c914..f4d8087d42d7d8f264d64b68d5d3a47a7b6d375c 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -838,6 +838,8 @@ def manifest_paths(app_dir, flavours):
          os.path.join(app_dir, 'build.gradle')]
 
     for flavour in flavours:
+        if flavour == 'yes':
+            continue
         possible_manifests.append(
             os.path.join(app_dir, 'src', flavour, 'AndroidManifest.xml'))
 

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 69b501f08a5fa35bd9b7bc96790bdc296016ab69..9499432627941d596c2520ecc2a9f63f53d6b3eb 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -603,8 +603,8 @@ def parse_metadata(metafile):
             # Port legacy ';' separators
             pv = [v.strip() for v in pv.replace(';', ',').split(',')]
             if pk == 'gradle':
-                if len(pv) == 1 and pv[0] in ['main', 'yes', '']:
-                    pv = []
+                if len(pv) == 1 and pv[0] in ['main', 'yes']:
+                    pv = ['yes']
             thisbuild[pk] = pv
         elif t == 'string' or t == 'script':
             thisbuild[pk] = pv