Fragile fix of MPool::create_whatprovides call

mamba-org · Apr 3, 2023 · ed94f5f · ed94f5f
1 parent 26c67a9
commit ed94f5f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/libmamba/src/api/install.cpp b/libmamba/src/api/install.cpp
@@ -510,8 +510,6 @@ namespace mamba
             solver.add_jobs(prefix_pkgs, SOLVER_LOCK);
         }
 
-        solver.add_jobs(specs, solver_flag);
-
         if (!no_pin)
         {
             solver.add_pins(file_pins(prefix_data.path() / "conda-meta" / "pinned"));
@@ -536,6 +534,11 @@ namespace mamba
             Console::instance().print("\nPinned packages:\n" + join("", pinned_str));
         }
 
+        // FRAGILE this must be called after pins be before jobs in current ``MPool``
+        pool.create_whatprovides();
+
+        solver.add_jobs(specs, solver_flag);
+
         bool success = solver.try_solve();
         if (!success)
         {

diff --git a/libmamba/src/api/update.cpp b/libmamba/src/api/update.cpp
@@ -77,27 +77,6 @@ namespace mamba
             }
         );
 
-        if (update_all)
-        {
-            auto hist_map = prefix_data.history().get_requested_specs_map();
-            std::vector<std::string> keep_specs;
-            for (auto& it : hist_map)
-            {
-                keep_specs.push_back(it.second.name);
-            }
-            solver_flag |= SOLVER_SOLVABLE_ALL;
-            if (prune)
-            {
-                solver_flag |= SOLVER_CLEANDEPS;
-            }
-            solver.add_jobs(keep_specs, SOLVER_USERINSTALLED);
-            solver.add_global_job(solver_flag);
-        }
-        else
-        {
-            solver.add_jobs(update_specs, solver_flag);
-        }
-
         auto& no_pin = config.at("no_pin").value<bool>();
         auto& no_py_pin = config.at("no_py_pin").value<bool>();
 
@@ -125,6 +104,31 @@ namespace mamba
             Console::instance().print("\nPinned packages:\n" + join("", pinned_str));
         }
 
+        // FRAGILE this must be called after pins be before jobs in current ``MPool``
+        pool.create_whatprovides();
+
+        if (update_all)
+        {
+            auto hist_map = prefix_data.history().get_requested_specs_map();
+            std::vector<std::string> keep_specs;
+            for (auto& it : hist_map)
+            {
+                keep_specs.push_back(it.second.name);
+            }
+            solver_flag |= SOLVER_SOLVABLE_ALL;
+            if (prune)
+            {
+                solver_flag |= SOLVER_CLEANDEPS;
+            }
+            solver.add_jobs(keep_specs, SOLVER_USERINSTALLED);
+            solver.add_global_job(solver_flag);
+        }
+        else
+        {
+            solver.add_jobs(update_specs, solver_flag);
+        }
+
+
         solver.must_solve();
 
         auto execute_transaction = [&](MTransaction& transaction)

diff --git a/libmamba/src/core/pool.cpp b/libmamba/src/core/pool.cpp
@@ -209,6 +209,9 @@ namespace mamba
             }
             ::Id const repr_id = pool_str2id(pool, repr.c_str(), /* .create= */ true);
             ::Id const offset = pool_queuetowhatprovides(pool, selected_pkgs.raw());
+            // FRAGILE This get deleted when calling ``pool_createwhatprovides`` so care
+            // must be taken to do it before
+            // TODO investigate namespace providers
             pool_set_whatprovides(pool, repr_id, offset);
             return repr_id;
         }

diff --git a/libmamba/src/core/solver.cpp b/libmamba/src/core/solver.cpp
@@ -478,8 +478,6 @@ namespace mamba
 
     bool MSolver::try_solve()
     {
-        m_pool.create_whatprovides();
-
         m_solver.reset(solver_create(m_pool));
         set_flags(m_flags);