From 3a7ad650e311033915db3353227d2b506ea8b642 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Thu, 29 Aug 2019 21:16:17 +0300
Subject: [PATCH 1/2] scanner: fix local Debian Maven repo handling

The resulting regex was 'https?://file:///usr/share/maven-repo' causing
scanner error.
---
 fdroidserver/scanner.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 866b8032..e4222526 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -110,7 +110,9 @@ def scan_source(build_dir, build=metadata.Build()):
         's3.amazonaws.com/repo.commonsware.com',  # CommonsWare
         'plugins.gradle.org/m2',  # Gradle plugin repo
         'maven.google.com',  # Google Maven Repo, https://developer.android.com/studio/build/dependencies.html#google-maven
-        'file:///usr/share/maven-repo',  # local repo on Debian installs
+        ]
+    ] + [re.compile(r'^file://' + re.escape(repo) + r'/*') for repo in [
+        '/usr/share/maven-repo',  # local repo on Debian installs
         ]
     ]
 

From 079754c56c24c82e9184925602d286acb867bedb Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Thu, 29 Aug 2019 21:21:09 +0300
Subject: [PATCH 2/2] scanner: add a test for the local Debian Maven repo

---
 .../info.guardianproject.ripple/build.gradle   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 tests/source-files/info.guardianproject.ripple/build.gradle

diff --git a/tests/source-files/info.guardianproject.ripple/build.gradle b/tests/source-files/info.guardianproject.ripple/build.gradle
new file mode 100644
index 00000000..5062b208
--- /dev/null
+++ b/tests/source-files/info.guardianproject.ripple/build.gradle
@@ -0,0 +1,18 @@
+buildscript {
+    repositories {
+        maven { url 'file:///usr/share/maven-repo' }
+        maven { url 'https://maven.google.com' }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.2'
+    }
+}
+
+allprojects {
+    repositories {
+        maven { url 'file:///usr/share/maven-repo' }
+        maven { url 'https://maven.google.com' }
+        jcenter()
+    }
+}