[vcpkg] Fix issue when removing packages that have explicit feature dependencies.

2 files changed, 34 insertions, 11 deletions

diff --git a/toolsrc/src/tests.plan.cpp b/toolsrc/src/tests.plan.cpp
index 546e20b0d..d33ab290d 100644
--- a/toolsrc/src/tests.plan.cpp
+++ b/toolsrc/src/tests.plan.cpp
@@ -780,6 +780,21 @@ namespace UnitTest1
             Assert::AreEqual("vtk", remove_plan[1].spec.name().c_str());
             Assert::AreEqual("expat", remove_plan[2].spec.name().c_str());
         }
+
+        TEST_METHOD(features_depend_core_remove_scheme)
+        {
+            std::vector<std::unique_ptr<StatusParagraph>> pghs;
+            pghs.push_back(make_status_pgh("curl", "", "", "x64"));
+            pghs.push_back(make_status_pgh("cpr", "curl[core]", "", "x64"));
+            StatusParagraphs status_db(std::move(pghs));
+
+            auto remove_plan = Dependencies::create_remove_plan(
+                {unsafe_pspec("curl", Triplet::from_canonical_name("x64"))}, status_db);
+
+            Assert::AreEqual(size_t(2), remove_plan.size());
+            Assert::AreEqual("cpr", remove_plan[0].spec.name().c_str());
+            Assert::AreEqual("curl", remove_plan[1].spec.name().c_str());
+        }
     };
 
     class UpgradePlanTests : public TestClass<UpgradePlanTests>
diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp
index 649e8f1d8..43e4d2721 100644
--- a/toolsrc/src/vcpkg/dependencies.cpp
+++ b/toolsrc/src/vcpkg/dependencies.cpp
@@ -29,7 +29,7 @@ namespace vcpkg::Dependencies
 
         Optional<const SourceControlFile*> source_control_file;
         PackageSpec spec;
-        std::unordered_map<std::string, FeatureNodeEdges> edges;
+        std::unordered_map<std::string, FeatureNodeEdges> edges_by_feature;
         std::set<std::string> to_install_features;
         std::set<std::string> original_features;
         bool will_remove = false;
@@ -100,13 +100,13 @@ namespace vcpkg::Dependencies
             FeatureNodeEdges core_dependencies;
             core_dependencies.build_edges =
                 filter_dependencies_to_specs(scf.core_paragraph->depends, out_cluster.spec.triplet());
-            out_cluster.edges.emplace("core", std::move(core_dependencies));
+            out_cluster.edges_by_feature.emplace("core", std::move(core_dependencies));
 
             for (const auto& feature : scf.feature_paragraphs)
             {
                 FeatureNodeEdges added_edges;
                 added_edges.build_edges = filter_dependencies_to_specs(feature->depends, out_cluster.spec.triplet());
-                out_cluster.edges.emplace(feature->name, std::move(added_edges));
+                out_cluster.edges_by_feature.emplace(feature->name, std::move(added_edges));
             }
             out_cluster.source_control_file = &scf;
         }
@@ -309,7 +309,15 @@ namespace vcpkg::Dependencies
                 {
                     if (an_installed_package->package.spec.triplet() != spec.triplet()) continue;
 
-                    const std::vector<std::string>& deps = an_installed_package->package.depends;
+                    std::vector<std::string> deps = an_installed_package->package.depends;
+                    // <hack>
+                    // This is a hack to work around existing installations that put featurespecs into binary packages
+                    // (example: curl[core]) Eventually, this can be returned to a simple string search.
+                    for (auto&& dep : deps)
+                    {
+                        dep.erase(std::find(dep.begin(), dep.end(), '['), dep.end());
+                    }
+                    // </hack>
                     if (std::find(deps.begin(), deps.end(), spec.name()) == deps.end()) continue;
 
                     dependents.push_back(an_installed_package->package.spec);
@@ -446,10 +454,10 @@ namespace vcpkg::Dependencies
             }
         }
 
-        auto it = cluster.edges.find(feature);
-        if (it == cluster.edges.end()) return MarkPlusResult::FEATURE_NOT_FOUND;
+        auto it = cluster.edges_by_feature.find(feature);
+        if (it == cluster.edges_by_feature.end()) return MarkPlusResult::FEATURE_NOT_FOUND;
 
-        if (cluster.edges[feature].plus) return MarkPlusResult::SUCCESS;
+        if (cluster.edges_by_feature[feature].plus) return MarkPlusResult::SUCCESS;
 
         if (cluster.original_features.find(feature) == cluster.original_features.end())
         {
@@ -460,7 +468,7 @@ namespace vcpkg::Dependencies
         {
             return MarkPlusResult::SUCCESS;
         }
-        cluster.edges[feature].plus = true;
+        cluster.edges_by_feature[feature].plus = true;
 
         if (!cluster.original_features.empty())
         {
@@ -485,7 +493,7 @@ namespace vcpkg::Dependencies
             auto res = mark_plus("", cluster, graph, graph_plan, prevent_default_features);
         }
 
-        for (auto&& depend : cluster.edges[feature].build_edges)
+        for (auto&& depend : cluster.edges_by_feature[feature].build_edges)
         {
             auto& depend_cluster = graph.get(depend.spec());
             auto res = mark_plus(depend.feature(), depend_cluster, graph, graph_plan, prevent_default_features);
@@ -521,7 +529,7 @@ namespace vcpkg::Dependencies
         }
 
         graph_plan.remove_graph.add_vertex({&cluster});
-        for (auto&& pair : cluster.edges)
+        for (auto&& pair : cluster.edges_by_feature)
         {
             auto& remove_edges_edges = pair.second.remove_edges;
             for (auto&& depend : remove_edges_edges)
@@ -746,7 +754,7 @@ namespace vcpkg::Dependencies
                 auto depends_name = dependency.feature();
                 if (depends_name.empty()) depends_name = "core";
 
-                auto& target_node = dep_cluster.edges[depends_name];
+                auto& target_node = dep_cluster.edges_by_feature[depends_name];
                 target_node.remove_edges.emplace_back(FeatureSpec{spec, status_paragraph_feature});
             }
         }