From ce61186cd2b16f017e2671443881c107a4d1609a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 15 Sep 2014 17:03:45 +0200 Subject: [PATCH] Fix issue where gradle=yes would be removed by rewritemeta --- fdroidserver/common.py | 2 ++ fdroidserver/metadata.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index ba8080a7..f4d8087d 100644 --- 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 69b501f0..94994326 100644 --- 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 -- 2.30.2