From 36d07520cfa7c95ec6bf3dfac4269493404ff09b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 23 Dec 2015 11:13:19 -0500 Subject: [PATCH 1/2] Fixed error message The product is now named bazel and that's the binary people have installed. --- src/main/cpp/blaze_startup_options_common.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc index 28f2a8ef445037..faa85a3f503fa5 100644 --- a/src/main/cpp/blaze_startup_options_common.cc +++ b/src/main/cpp/blaze_startup_options_common.cc @@ -260,7 +260,7 @@ blaze_exit_code::ExitCode BlazeStartupOptions::ProcessArg( if (!extra_argument_processed) { blaze_util::StringPrintf( error, "Unknown %s startup option: '%s'.\n" - " For more info, run 'blaze help startup_options'.", + " For more info, run 'bazel help startup_options'.", GetProductName().c_str(), arg); return blaze_exit_code::BAD_ARGV; } From 91669dc81e3cf2a737c3533e562d47aa44cbefba Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 25 Dec 2015 10:51:10 -0500 Subject: [PATCH 2/2] Use the correct product name always --- src/main/cpp/blaze_startup_options_common.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc index faa85a3f503fa5..5fd44218a022e6 100644 --- a/src/main/cpp/blaze_startup_options_common.cc +++ b/src/main/cpp/blaze_startup_options_common.cc @@ -260,8 +260,8 @@ blaze_exit_code::ExitCode BlazeStartupOptions::ProcessArg( if (!extra_argument_processed) { blaze_util::StringPrintf( error, "Unknown %s startup option: '%s'.\n" - " For more info, run 'bazel help startup_options'.", - GetProductName().c_str(), arg); + " For more info, run '%s help startup_options'.", + GetProductName().c_str(), arg, GetProductName().c_str()); return blaze_exit_code::BAD_ARGV; } }