From bae94931b46e84b0976deed40fe59eb9b04d2f7e Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 22 Feb 2023 11:58:25 +0100 Subject: [PATCH] Fix openjdk detection on different architectures 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. --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b90c9bad..a906c1f1 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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) ]: