| commit | c68c9ba4c51f3d058ce5942e8abd4984c362876a | [log] [tgz] |
|---|---|---|
| author | Googler <tomrenn@google.com> | Wed Oct 09 08:56:20 2024 -0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Wed Oct 09 08:57:44 2024 -0700 |
| tree | 3d2c3db70737345dd54261a9827295c2ed7e0206 | |
| parent | 0811603eb958b0c49fcd47cfa65732ef020f973a [diff] |
Trim Workspace Status values 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
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 bc18fe8..cec59ab 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
@@ -142,7 +142,7 @@ 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()); } }