From ab637370eb898ead80c476b111a9237d7f8d8146 Mon Sep 17 00:00:00 2001 From: Tom Renn Date: Wed, 9 Oct 2024 12:45:15 -0700 Subject: [PATCH] Trim Workspace Status values (#23922) On windows, bazel will run the workspace_status_command, and receive carriage return characters \r even if the workspace_status_command did not include them. Fixes https://github.com/bazelbuild/bazel/issues/13442 PiperOrigin-RevId: 684055158 Change-Id: Idd3bd9c954d64b0a2d674dd7d90cf61c00955917 Co-authored-by: Googler --- .../devtools/build/lib/bazel/BazelWorkspaceStatusModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java index f7e4e08f51a1b9..1a7f12986cffb5 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java @@ -149,7 +149,7 @@ private static Map parseWorkspaceStatus(String input) { for (String line : input.trim().split("\n")) { String[] splitLine = line.split(" ", 2); if (splitLine.length >= 2) { - result.put(splitLine[0], splitLine[1]); + result.put(splitLine[0], splitLine[1].trim()); } }