aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Benjamin Staffin <benley@gmail.com>2016-12-05 14:10:27 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-12-05 15:02:50 +0000
commit21759e7695e302f18fc60cb9f17a8e68199ceeea (patch)
tree2cc9ab05f7378b4a5094408f9dc1b23bdc90b22c /src
parentc860f1a7e76fd1d8b2cc472d80de4901a8762639 (diff)
Include a trailing newline in printStatusMap output
This makes it harder to screw up when doing things like concatenating bazel-out/{stable,volatile}-status.txt in a genrule, and makes console output slightly nicer when you print them to stdout. -- Change-Id: Ib558ddcb09e66452a4780355716d9d6d1d143355 Reviewed-on: https://cr.bazel.build/7190 PiperOrigin-RevId: 141044546 MOS_MIGRATED_REVID=141044546
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java20
1 files changed, 13 insertions, 7 deletions
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 cc8c96d826..4282c762e6 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
@@ -150,13 +150,19 @@ public class BazelWorkspaceStatusModule extends BlazeModule {
}
private static byte[] printStatusMap(Map<String, String> map) {
- return Joiner.on("\n").join(Iterables.transform(map.entrySet(),
- new Function<Map.Entry<String, String>, String>() {
- @Override
- public String apply(@Nullable Entry<String, String> entry) {
- return entry.getKey() + " " + entry.getValue();
- }
- })).getBytes(StandardCharsets.UTF_8);
+ String s =
+ Joiner.on("\n")
+ .join(
+ Iterables.transform(
+ map.entrySet(),
+ new Function<Map.Entry<String, String>, String>() {
+ @Override
+ public String apply(@Nullable Entry<String, String> entry) {
+ return entry.getKey() + " " + entry.getValue();
+ }
+ }));
+ s += "\n";
+ return s.getBytes(StandardCharsets.UTF_8);
}
@Override