From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 21 Mar 2014 18:11:52 +0000 (+0100)
Subject: Better gradle signing keys regexes
X-Git-Tag: 0.2~172
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7cf368df70581e95aaf282aecb88df4177b14258;p=fdroidserver.git

Better gradle signing keys regexes
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 0dbe3e9c..0d0ccccd 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1409,9 +1409,10 @@ def remove_signing_keys(build_dir):
     signing_configs = re.compile(r'^[\t ]*signingConfigs[ \t]*{[ \t]*$')
     line_matches = [
             re.compile(r'^[\t ]*signingConfig [^ ]*$'),
-            re.compile(r'android.signingConfigs.'),
-            re.compile(r'variant.outputFile = '),
-            re.compile(r'.readLine\('),
+            re.compile(r'.*android\.signingConfigs\..*'),
+            re.compile(r'.*variant\.outputFile = .*'),
+            re.compile(r'.*\.readLine\(.*'),
+            re.compile(r'.*System\.console\(\).*'),
     ]
     for root, dirs, files in os.walk(build_dir):
         if 'build.gradle' in files: