CommandDispatcher: s/blaze/bazel/ in error message
RELNOTES: none
@@ -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,11 +197,12 @@ public class BlazeCommandDispatcher {
Command commandAnnotation, List<String> args, List<String> rcfileNotes, OutErr outErr)
throws OptionsParsingException {
- Function<String, String> commandOptionSourceFunction = new Function<String, String>() {
+ 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";
+ return "options generated by " + runtime.getProductName() + " launcher";
} else {
return "command line options";
}
@@ -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));
