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:
3e04a44
)
Don't match gradle plugin import lines which are commented
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 7 May 2015 22:58:52 +0000
(
00:58
+0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 7 May 2015 22:58:52 +0000
(
00:58
+0200)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 23b1ead5c982e34febde47b3cdfe4ae7cebd7174..928f1d6d414f262005fdd2a5360b4cc7d1698679 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-1293,7
+1293,7
@@
def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if build['type'] == 'gradle':
flavours = build['gradle']
- version_regex = re.compile(r"
.
*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
+ version_regex = re.compile(r"
[^/]
*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None
gradle_dirs = [root_dir]