diff options
| author | gritukan <58486012+gritukan@users.noreply.github.com> | 2020-12-15 03:23:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 16:23:56 -0800 |
| commit | 2aaa67573085c24bcb4e224b87605d708d9a6377 (patch) | |
| tree | 42f7ce925c8f029d018a8cc0711739c964bc1de6 | |
| parent | 54d73a56f8c3cdc5a2646a365a12f0ead961bb41 (diff) | |
| download | vcpkg-2aaa67573085c24bcb4e224b87605d708d9a6377.tar.gz vcpkg-2aaa67573085c24bcb4e224b87605d708d9a6377.zip | |
Properly index package actions in log (#15076)
| -rw-r--r-- | toolsrc/src/vcpkg/install.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index eee0eca0e..dd89a7567 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -435,13 +435,14 @@ namespace vcpkg::Install SpecSummary* current_summary = nullptr; Chrono::ElapsedTimer build_timer = Chrono::ElapsedTimer::create_started(); - TrackedPackageInstallGuard(const size_t package_count, + TrackedPackageInstallGuard(const size_t action_index, + const size_t action_count, std::vector<SpecSummary>& results, const PackageSpec& spec) { results.emplace_back(spec, nullptr); current_summary = &results.back(); - System::printf("Starting package %zd/%zd: %s\n", results.size(), package_count, spec.to_string()); + System::printf("Starting package %zd/%zd: %s\n", action_index, action_count, spec.to_string()); } ~TrackedPackageInstallGuard() @@ -465,12 +466,13 @@ namespace vcpkg::Install const CMakeVars::CMakeVarProvider& var_provider) { std::vector<SpecSummary> results; - const size_t package_count = action_plan.remove_actions.size() + action_plan.install_actions.size(); + const size_t action_count = action_plan.remove_actions.size() + action_plan.install_actions.size(); + size_t action_index = 1; const auto timer = Chrono::ElapsedTimer::create_started(); for (auto&& action : action_plan.remove_actions) { - TrackedPackageInstallGuard this_install(package_count, results, action.spec); + TrackedPackageInstallGuard this_install(action_index++, action_count, results, action.spec); Remove::perform_remove_plan_action(paths, action, Remove::Purge::YES, &status_db); } @@ -488,7 +490,7 @@ namespace vcpkg::Install for (auto&& action : action_plan.install_actions) { - TrackedPackageInstallGuard this_install(package_count, results, action.spec); + TrackedPackageInstallGuard this_install(action_index++, action_count, results, action.spec); auto result = perform_install_plan_action(args, paths, action, status_db, binaryprovider, build_logs_recorder); if (result.code != BuildResult::SUCCEEDED && keep_going == KeepGoing::NO) |