diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-13 16:23:21 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-15 18:06:06 -0800 |
| commit | 430739c468f7ea3cc513b85339ac51c16073325c (patch) | |
| tree | 73a4f78ab335ee6b30071fe1b1249337bc0d901e /toolsrc/src | |
| parent | 6824cc9264d245ebd1302c27eb714250c5f7ec13 (diff) | |
| download | vcpkg-430739c468f7ea3cc513b85339ac51c16073325c.tar.gz vcpkg-430739c468f7ea3cc513b85339ac51c16073325c.zip | |
Change parameter from std::string to package_spec
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 6 | ||||
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 750350a4a..264f9c06e 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -95,9 +95,9 @@ namespace vcpkg::Commands::Build } } - std::string create_error_message(const BuildResult build_result, const std::string& package_id) + std::string create_error_message(const BuildResult build_result, const package_spec& spec) { - return Strings::format("Error: Building package %s failed with: %s", package_id, Build::to_string(build_result)); + return Strings::format("Error: Building package %s failed with: %s", spec.toString(), Build::to_string(build_result)); } std::string create_user_troubleshooting_message(const package_spec& spec) @@ -167,7 +167,7 @@ namespace vcpkg::Commands::Build if (result != BuildResult::SUCCEEDED) { - System::println(System::color::error, Build::create_error_message(result, spec.toString())); + System::println(System::color::error, Build::create_error_message(result, spec)); System::println(Build::create_user_troubleshooting_message(spec)); exit(EXIT_FAILURE); } diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp index fbda74f3f..0b4010310 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(result, spec->toString())); + System::println(System::color::error, Build::create_error_message(result, *spec)); System::println(Build::create_user_troubleshooting_message(*spec)); exit(EXIT_FAILURE); } diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index d6239b080..dd42335df 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(result, action.spec.toString())); + System::println(System::color::error, Build::create_error_message(result, action.spec)); 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 af068a4fb..d4ec64e09 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(result, action.spec.toString())); + System::println(System::color::error, Build::create_error_message(result, action.spec)); System::println(Build::create_user_troubleshooting_message(action.spec)); exit(EXIT_FAILURE); } |