diff options
author | 2017-04-11 07:54:07 +0000 | |
---|---|---|
committer | 2017-04-11 10:50:32 +0200 | |
commit | 6a1f3aa7d973b1bba4582bd801e881c2561da743 (patch) | |
tree | 067020b774e042cc26910bd916117adb76f939b1 /src/main | |
parent | 6ddcf4ff9671e558f31b726f0b5930e126e81965 (diff) |
CommandDispatcher: s/blaze/bazel/ in error message
RELNOTES: none
PiperOrigin-RevId: 152783295
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java index f7fadb52ba..3b26e1e990 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java @@ -184,7 +184,10 @@ public class BlazeCommandDispatcher { outErr.printErrLn(getNotInRealWorkspaceError(doNotBuild)); return ExitCode.COMMAND_LINE_ERROR; } else { - outErr.printErrLn("WARNING: Blaze is run from output directory. This is unsound."); + outErr.printErrLn( + "WARNING: " + + runtime.getProductName() + + " is run from output directory. This is unsound."); } } return ExitCode.SUCCESS; @@ -194,16 +197,17 @@ public class BlazeCommandDispatcher { Command commandAnnotation, List<String> args, List<String> rcfileNotes, OutErr outErr) throws OptionsParsingException { - Function<String, String> commandOptionSourceFunction = new Function<String, String>() { - @Override - public String apply(String input) { - if (INTERNAL_COMMAND_OPTIONS.contains(input)) { - return "options generated by Blaze launcher"; - } else { - return "command line options"; - } - } - }; + Function<String, String> commandOptionSourceFunction = + new Function<String, String>() { + @Override + public String apply(String input) { + if (INTERNAL_COMMAND_OPTIONS.contains(input)) { + return "options generated by " + runtime.getProductName() + " launcher"; + } else { + return "command line options"; + } + } + }; // Explicit command-line options: List<String> cmdLineAfterCommand = args.subList(1, args.size()); @@ -659,7 +663,9 @@ public class BlazeCommandDispatcher { } private String getNotInRealWorkspaceError(Path doNotBuildFile) { - String message = "Blaze should not be called from a Blaze output directory. "; + String message = + String.format( + "%1$s should not be called from a %1$s output directory. ", runtime.getProductName()); try { String realWorkspace = new String(FileSystemUtils.readContentAsLatin1(doNotBuildFile)); |