Merge branch 'fixFlavor' into 'master'

[fdroidserver.git] / fdroidserver / common.py

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 5d35f3c79d053b80e905e0a8113b9b2ff3c60cb9..624e93538d9d0de01dfb2561d94154fe4d3c2c2b 100644 (file)
--- 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)