From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 11 Feb 2016 21:48:51 +0000 (+0000)
Subject: common: add regexp for arch oracle paths
X-Git-Tag: 0.6.0~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7feeaad095c192eda4f256ecf9beb6432da385d8;p=fdroidserver.git

common: add regexp for arch oracle paths
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f9d04a0e..120ef2aa 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -143,6 +143,7 @@ def fill_config_defaults(thisconfig):
                           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-([6-9])-jdk',  # Arch (oracle)
                           r'java-1\.([6-9])\.0-.*',  # RedHat
                           r'java-([6-9])-oracle',  # Debian WebUpd8
                           r'jdk-([6-9])-oracle-.*',  # Debian make-jpkg