From d962c232774fb7d8a2716abb5b6701a3568b614c Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 9 Apr 2026 13:26:02 +0100 Subject: [PATCH] ansible: fix existing Java detection edge case Add additional check for whether an existing `java` ran successfully as the original check could erroneously match if the Java version being checked for was in an error message (e.g. part of the directory name included in the message). --- ansible/roles/java-base/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index f5510fed2..f0b1a46ca 100644 --- a/ansible/roles/java-base/tasks/main.yml +++ b/ansible/roles/java-base/tasks/main.yml @@ -50,7 +50,7 @@ # If we're already using the latest there is no need to do anything. - name: check existing adoptopenjdk version is up to date set_fact: - update_adoptopenjdk: "{{ adoptopenjdk_metadata.json[0].version_data.openjdk_version not in java.stdout }}" + update_adoptopenjdk: "{{ java.rc != 0 or adoptopenjdk_metadata.json[0].version_data.openjdk_version not in java.stdout }}" when: use_adoptopenjdk == True - name: create cache directory for adoptopenjdk binaries