From: Daniel Martí Date: Thu, 7 May 2015 22:58:52 +0000 (+0200) Subject: Don't match gradle plugin import lines which are commented X-Git-Tag: 0.4.0~82 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ce48e8f78db77864db6a9818a91862dc95a3d020;p=fdroidserver.git Don't match gradle plugin import lines which are commented --- diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 23b1ead5..928f1d6d 100644 --- 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]