Skip to content

[GR-52975] Retain LC_ variables when sanitizing the environment for the image builder. #8665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2024
Merged

[GR-52975] Retain LC_ variables when sanitizing the environment for the image builder. #8665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ private static void deprecatedSanitizeJVMEnvironment(Map<String, String> environ
}

private static void sanitizeJVMEnvironment(Map<String, String> environment, Map<String, String> imageBuilderEnvironment) {
Set<String> requiredKeys = new HashSet<>(List.of("PATH", "PWD", "HOME", "LANG", "LC_ALL"));
Set<String> requiredKeys = new HashSet<>(List.of("PATH", "PWD", "HOME", "LANG", "LANGUAGE"));
Function<String, String> keyMapper;
if (OS.WINDOWS.isCurrent()) {
requiredKeys.addAll(List.of("TEMP", "INCLUDE", "LIB"));
Expand All @@ -1788,7 +1788,9 @@ private static void sanitizeJVMEnvironment(Map<String, String> environment, Map<
}
Map<String, String> restrictedEnvironment = new HashMap<>();
environment.forEach((key, val) -> {
if (requiredKeys.contains(keyMapper.apply(key))) {
String mappedKey = keyMapper.apply(key);
// LC_* are locale vars that override LANG for specific categories (or all, with LC_ALL)
if (requiredKeys.contains(mappedKey) || mappedKey.startsWith("LC_")) {
restrictedEnvironment.put(key, val);
}
});
Expand Down