From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 11 Feb 2016 21:34:44 +0000 (+0000)
Subject: common: fix JDK detection on latest arch
X-Git-Tag: 0.6.0~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=28db5b82c24cec676c74e13c2519ce667c5b75f4

common: fix JDK detection on latest arch
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c30d3b4e..f9d04a0e 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -142,6 +142,7 @@ def fill_config_defaults(thisconfig):
             for regex in (r'1\.([6-9])\.0\.jdk',  # OSX
                           r'jdk1\.([6-9])\.0_[0-9]+.jdk',  # OSX and Oracle tarball
                           r'jdk([6-9])-openjdk',  # Arch
+                          r'java-([6-9])-openjdk',  # Arch
                           r'java-1\.([6-9])\.0-.*',  # RedHat
                           r'java-([6-9])-oracle',  # Debian WebUpd8
                           r'jdk-([6-9])-oracle-.*',  # Debian make-jpkg