From 959cff707b07a7147499eb867002c9faa4a8677d Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Fri, 15 Sep 2023 11:33:56 +0200 Subject: [PATCH] fetch-jdk: fix {jvmci-tag} keyword pattern --- mx_fetchjdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mx_fetchjdk.py b/mx_fetchjdk.py index b43fb548..988799ac 100644 --- a/mx_fetchjdk.py +++ b/mx_fetchjdk.py @@ -584,8 +584,8 @@ def get_final_path(self, jdk_path): _instantiate_filters = { - 'jvmci': lambda value: re.sub(r"(?:.*)-(.*jvmci-b\d+).*|.*jvmci-(\d+\.\d+-b\d+).*", r"\1\2", value), - 'jvmci-tag': lambda value: re.sub(r"(?:.*)-(.*jvmci-b\d+).*|.*(jvmci-\d+\.\d+-b\d+).*", r"\1\2", value) + 'jvmci': lambda value: re.sub(r"(?:.*)-(.*-jvmci-b\d+).*|.*jvmci-(\d+\.\d+-b\d+).*", r"\1\2", value), + 'jvmci-tag': lambda value: re.sub(r"(?:.*)-(.*-jvmci-b\d+).*|.*(jvmci-\d+\.\d+-b\d+).*", r"\1\2", value) } def _quote(value):