mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-06 11:00:13 +02:00
Merge branch 'fix_java_arch' into 'master'
Fix openjdk detection on different architectures See merge request fdroid/fdroidserver!1315
This commit is contained in:
commit
4037f4b18f
@ -202,7 +202,7 @@ def _add_java_paths_to_config(pathlist, thisconfig):
|
|||||||
r'^java-1\.([126-9][0-9]?)\.0-.*$', # RedHat
|
r'^java-1\.([126-9][0-9]?)\.0-.*$', # RedHat
|
||||||
r'^java-([126-9][0-9]?)-oracle$', # Debian WebUpd8
|
r'^java-([126-9][0-9]?)-oracle$', # Debian WebUpd8
|
||||||
r'^jdk-([126-9][0-9]?)-oracle-.*$', # Debian make-jpkg
|
r'^jdk-([126-9][0-9]?)-oracle-.*$', # Debian make-jpkg
|
||||||
r'^java-([126-9][0-9]?)-openjdk-[^c][^o][^m].*$', # Debian
|
r'^java-([126-9][0-9]?)-openjdk-.*$', # Debian
|
||||||
r'^oracle-jdk-bin-1\.([126-9][0-9]?).*$', # Gentoo (oracle)
|
r'^oracle-jdk-bin-1\.([126-9][0-9]?).*$', # Gentoo (oracle)
|
||||||
r'^icedtea-bin-([126-9][0-9]?).*$', # Gentoo (openjdk)
|
r'^icedtea-bin-([126-9][0-9]?).*$', # Gentoo (openjdk)
|
||||||
]:
|
]:
|
||||||
|
Loading…
Reference in New Issue
Block a user