chiark / gitweb /
common: add regexp for arch oracle paths
authorDaniel Martí <mvdan@mvdan.cc>
Thu, 11 Feb 2016 21:48:51 +0000 (21:48 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Thu, 11 Feb 2016 21:48:51 +0000 (21:48 +0000)
fdroidserver/common.py

index f9d04a0e25f921d6bc26edcb47425b35526b4479..120ef2aa0134f4f9de5d481e4c6d8c7e034da51c 100644 (file)
@@ -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