mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 06:30:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix_java_arch' into 'master'

Browse source 
Fix openjdk detection on different architectures

See merge request fdroid/fdroidserver!1315
This commit is contained in:
Hans-Christoph Steiner 2023-02-22 11:25:22 +00:00
commit 4037f4b18f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -202,7 +202,7 @@ def _add_java_paths_to_config(pathlist, thisconfig):
r'^java-1\.([126-9][0-9]?)\.0-.*$', # RedHat
r'^java-([126-9][0-9]?)-oracle$', # Debian WebUpd8
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'^icedtea-bin-([126-9][0-9]?).*$', # Gentoo (openjdk)
]: