diff options
Diffstat (limited to 'toolsrc/src/commands_ci.cpp')
| -rw-r--r-- | toolsrc/src/commands_ci.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 72137f8bb..8972aa339 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -48,7 +48,8 @@ namespace vcpkg::Commands::CI { const ElapsedTime build_timer = ElapsedTime::create_started(); counter++; - System::println("Starting package %d/%d: %s", counter, package_count, action.spec.to_string()); + const std::string display_name = action.spec.display_name(); + System::println("Starting package %d/%d: %s", counter, package_count, display_name); timing.push_back(-1); results.push_back(BuildResult::NULLVALUE); @@ -58,7 +59,7 @@ namespace vcpkg::Commands::CI if (action.plan.plan_type == InstallPlanType::ALREADY_INSTALLED) { results.back() = BuildResult::SUCCEEDED; - System::println(System::Color::success, "Package %s is already installed", action.spec); + System::println(System::Color::success, "Package %s is already installed", display_name); } else if (action.plan.plan_type == InstallPlanType::BUILD_AND_INSTALL) { @@ -76,23 +77,23 @@ namespace vcpkg::Commands::CI } const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO); Install::install_package(paths, bpgh, &status_db); - System::println(System::Color::success, "Package %s is installed", action.spec); + System::println(System::Color::success, "Package %s is installed", display_name); } else if (action.plan.plan_type == InstallPlanType::INSTALL) { results.back() = BuildResult::SUCCEEDED; Install::install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Package %s is installed from cache", action.spec); + System::println(System::Color::success, "Package %s is installed from cache", display_name); } else Checks::unreachable(VCPKG_LINE_INFO); } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); results.back() = BuildResult::NULLVALUE; } - System::println("Elapsed time for package %s: %s", action.spec, build_timer.to_string()); + System::println("Elapsed time for package %s: %s", action.spec.display_name(), build_timer.to_string()); } System::println("Total time taken: %s", timer.to_string()); |