From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 11 Dec 2017 11:04:17 +0000 (+0100)
Subject: regex only for flavor blocks: flavor { ... } and nothing else
X-Git-Tag: 1.0.0~29^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=03f301470e359ecd11b1b3ba0df516cd77915a49

regex only for flavor blocks: flavor { ... } and nothing else
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6511181f..f39db69b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1338,7 +1338,7 @@ def parse_androidmanifests(paths, app):
             with open(path, 'r') as f:
                 buildfile = f.read()
 
-                regex_string = r"" + flavour + ".*?}"
+                regex_string = r"" + flavour + "[^}]*?{.*?}"
                 search = re.compile(regex_string, re.DOTALL)
                 result = search.search(buildfile)