@@ -224,7 +224,7 @@ namespace vcpkg
224
224
const auto package_dir = paths.package_dir (bcf.core_paragraph .spec );
225
225
Triplet triplet = bcf.core_paragraph .spec .triplet ();
226
226
const std::vector<StatusParagraphAndAssociatedFiles> pgh_and_files =
227
- get_installed_files (fs, installed, *status_db);
227
+ get_installed_files_and_upgrade (fs, installed, *status_db);
228
228
229
229
const SortedVector<std::string> package_files = build_list_of_package_files (fs, package_dir);
230
230
const SortedVector<file_pack> installed_files = build_list_of_installed_files (pgh_and_files, triplet);
@@ -617,6 +617,7 @@ namespace vcpkg
617
617
this_install.current_summary .build_result .emplace (std::move (result));
618
618
}
619
619
620
+ database_load_collapse (fs, paths.installed ());
620
621
msg::println (msgTotalInstallTime, msg::elapsed = timer.to_string ());
621
622
return InstallSummary{std::move (results)};
622
623
}
@@ -1286,7 +1287,7 @@ namespace vcpkg
1286
1287
1287
1288
// create the plan
1288
1289
msg::println (msgComputingInstallPlan);
1289
- StatusParagraphs status_db = database_load_check (fs, paths.installed ());
1290
+ StatusParagraphs status_db = database_load_collapse (fs, paths.installed ());
1290
1291
1291
1292
// Note: action_plan will hold raw pointers to SourceControlFileLocations from this map
1292
1293
auto action_plan = create_feature_install_plan (provider, var_provider, specs, status_db, create_options);
0 commit comments