From 63f85ddad6a8abdb4bf5b1e15c3f122f39847ee9 Mon Sep 17 00:00:00 2001 From: Simon Tooke Date: Tue, 29 Jul 2025 14:30:19 -0400 Subject: [PATCH 1/2] Captialize environment variable name prior to check --- .../src/com/oracle/svm/core/util/EnvVariableUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java index 43a5884f6eed..3729bdaebafd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java @@ -51,6 +51,8 @@ private static Set getRequiredEnvVariableKeys() { if (OS.WINDOWS.isCurrent()) { requiredEnvVariableKeys.addAll(REQUIRED_ENV_VARIABLE_KEYS_WINDOWS); } + System.out.printf("XXX cout reuired var= %s\n", requiredEnvVariableKeys); + System.err.printf("XXX cerr reuired var= %s\n", requiredEnvVariableKeys); return requiredEnvVariableKeys; } @@ -82,12 +84,12 @@ public boolean isKeyRequired() { } public static boolean isKeyRequired(String key) { - mapKey(key); - return isKeyRequiredCondition(key); + return isKeyRequiredCondition(mapKey(key)); } private static String mapKey(String key) { if (OS.WINDOWS.isCurrent()) { + System.err.println("XXX ROOT mapKey " + key + " to " + key.toUpperCase(Locale.ROOT)); return key.toUpperCase(Locale.ROOT); } return key; @@ -95,6 +97,7 @@ private static String mapKey(String key) { private static boolean isKeyRequiredCondition(String key) { // LC_* are locale vars that override LANG for specific categories (or all, with LC_ALL) + System.err.println("XXX cerr key " + key + " req=" + REQUIRED_ENV_VARIABLE_KEYS.contains(key)); return REQUIRED_ENV_VARIABLE_KEYS.contains(key) || key.startsWith("LC_"); } } From f1db53cb024ccaaf48e3a1f2d29bdd534b7b9e0b Mon Sep 17 00:00:00 2001 From: Simon Tooke Date: Tue, 29 Jul 2025 14:49:58 -0400 Subject: [PATCH 2/2] clean up debug messages --- .../src/com/oracle/svm/core/util/EnvVariableUtils.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java index 3729bdaebafd..f4faed834355 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/EnvVariableUtils.java @@ -51,8 +51,6 @@ private static Set getRequiredEnvVariableKeys() { if (OS.WINDOWS.isCurrent()) { requiredEnvVariableKeys.addAll(REQUIRED_ENV_VARIABLE_KEYS_WINDOWS); } - System.out.printf("XXX cout reuired var= %s\n", requiredEnvVariableKeys); - System.err.printf("XXX cerr reuired var= %s\n", requiredEnvVariableKeys); return requiredEnvVariableKeys; } @@ -89,7 +87,6 @@ public static boolean isKeyRequired(String key) { private static String mapKey(String key) { if (OS.WINDOWS.isCurrent()) { - System.err.println("XXX ROOT mapKey " + key + " to " + key.toUpperCase(Locale.ROOT)); return key.toUpperCase(Locale.ROOT); } return key; @@ -97,7 +94,6 @@ private static String mapKey(String key) { private static boolean isKeyRequiredCondition(String key) { // LC_* are locale vars that override LANG for specific categories (or all, with LC_ALL) - System.err.println("XXX cerr key " + key + " req=" + REQUIRED_ENV_VARIABLE_KEYS.contains(key)); return REQUIRED_ENV_VARIABLE_KEYS.contains(key) || key.startsWith("LC_"); } }