chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6640f27
)
regex only for flavor blocks: flavor { ... } and nothing else
author
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 11 Dec 2017 11:04:17 +0000
(12:04 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 11 Dec 2017 13:29:32 +0000
(14:29 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 6511181f0f2404b58bd0fbdc6d0e9e896e83852f..f39db69b6028456f2873383bd7c81e84c3fe5486 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)