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

Fix openjdk detection on different architectures

Browse source 
The pattern in Debian is:

java-$VERSION-openjdk-$DEB_HOST_ARCH

The regex for $DEB_HOST_ARCH did not match arm64, armel and armhf. As it
can be any string just match anything.
This commit is contained in:
Jochen Sprickerhof 2023-02-22 11:58:25 +01:00 • committed by Hans-Christoph Steiner
parent d5bd2350a2
commit bae94931b4
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)
]: