diff options
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_build_external.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_ci.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 976e66c18..1dbc9c375 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -22,7 +22,7 @@ namespace vcpkg::Commands }; const std::string& to_string(const BuildResult build_result); - std::string create_error_message(const std::string& package_id, const BuildResult build_result); + std::string create_error_message(const BuildResult build_result, const std::string& package_id); BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet); diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 8dc4a455d..afc814451 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -103,7 +103,7 @@ namespace vcpkg::Commands::Build } } - std::string create_error_message(const std::string& package_id, const BuildResult build_result) + std::string create_error_message(const BuildResult build_result, const std::string& package_id) { return Strings::format("Error: Building package %s failed with: %s", package_id, Build::to_string(build_result)); } @@ -164,7 +164,7 @@ namespace vcpkg::Commands::Build if (result != BuildResult::SUCCEEDED) { - System::println(System::color::error, Build::create_error_message(spec.toString(), result)); + System::println(System::color::error, Build::create_error_message(result, spec.toString())); exit(EXIT_FAILURE); } diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp index 0b2fdc766..42b649dc3 100644 --- a/toolsrc/src/commands_build_external.cpp +++ b/toolsrc/src/commands_build_external.cpp @@ -26,7 +26,7 @@ namespace vcpkg::Commands::BuildExternal const Build::BuildResult result = Commands::Build::build_package(*spgh, *spec, paths, port_dir, status_db); if (result != Build::BuildResult::SUCCEEDED) { - System::println(System::color::error, Build::create_error_message(spec->toString(), result)); + System::println(System::color::error, Build::create_error_message(result, spec->toString())); exit(EXIT_FAILURE); } diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 189a801da..d6239b080 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -58,7 +58,7 @@ namespace vcpkg::Commands::CI results.push_back(result); if (result != Build::BuildResult::SUCCEEDED) { - System::println(System::color::error, Build::create_error_message(action.spec.toString(), result)); + System::println(System::color::error, Build::create_error_message(result, action.spec.toString())); continue; } const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw(); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index b1a0108b7..76b9e36e4 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -217,7 +217,7 @@ namespace vcpkg::Commands::Install const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), status_db); if (result != Build::BuildResult::SUCCEEDED) { - System::println(System::color::error, Build::create_error_message(action.spec.toString(), result)); + System::println(System::color::error, Build::create_error_message(result, action.spec.toString())); exit(EXIT_FAILURE); } const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw(); |