mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: fix JDK detection on latest arch

Browse source
This commit is contained in:
Daniel Martí 2016-02-11 21:34:44 +00:00
parent 6fc62fe609
commit 28db5b82c2
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
fdroidserver/common.py
View file

@ -142,6 +142,7 @@ def fill_config_defaults(thisconfig):
for regex in (r'1\.([6-9])\.0\.jdk', # OSX for regex in (r'1\.([6-9])\.0\.jdk', # OSX
r'jdk1\.([6-9])\.0_[0-9]+.jdk', # OSX and Oracle tarball r'jdk1\.([6-9])\.0_[0-9]+.jdk', # OSX and Oracle tarball
r'jdk([6-9])-openjdk', # Arch r'jdk([6-9])-openjdk', # Arch
r'java-([6-9])-openjdk', # Arch
r'java-1\.([6-9])\.0-.*', # RedHat r'java-1\.([6-9])\.0-.*', # RedHat
r'java-([6-9])-oracle', # Debian WebUpd8 r'java-([6-9])-oracle', # Debian WebUpd8
r'jdk-([6-9])-oracle-.*', # Debian make-jpkg r'jdk-([6-9])-oracle-.*', # Debian make-jpkg