From f7e902221717825810f5a1e989e52c50554d1b6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 8 Oct 2015 12:16:45 +0200 Subject: [PATCH] scanner: ignore gradle comment lines Useful to detect: maven { // foo url "http://foo.bar" } --- fdroidserver/scanner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index 5587bd4b..ab410301 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -191,7 +191,8 @@ def scan_source(build_dir, root_dir, thisbuild): if is_used_by_gradle(line): for name in suspects_found(line): count += handleproblem('usual supect \'%s\' at line %d' % (name, i+1), fd, fp) - joined = re.sub(r'[\n\r\s]+', ' ', ' '.join(lines)) + noncomment_lines = [l for l in lines if not common.gradle_comment.match(l)] + joined = re.sub(r'[\n\r\s]+', ' ', ' '.join(noncomment_lines)) for m in gradle_mavenrepo.finditer(joined): url = m.group(2) if not any(r.match(url) for r in allowed_repos): -- 2.30.2