Only create solver::libsolv::Database if needed

Signed-off-by: Julien Jerphanion <[email protected]>

Author: jjerphan

libmamba/src/api/install.cpp

@@ -491,17 +491,19 @@ namespace mamba
                 LOG_WARNING << "No 'channels' specified";
             }
 
-            solver::libsolv::Database initial_db(
-                channel_context.params(),
-                { ctx.experimental_matchspec_parsing ? solver::libsolv::MatchSpecParser::Mamba
-                                                     : solver::libsolv::MatchSpecParser::Libsolv }
-            );
             solver::DatabaseVariant db_variant = ctx.experimental_resolvo_solver
                                                      ? solver::DatabaseVariant(
                                                            std::in_place_type<solver::resolvo::Database>,
                                                            channel_context.params()
                                                        )
-                                                     : solver::DatabaseVariant(std::move(initial_db));
+                                                     : solver::DatabaseVariant(
+                                                           std::in_place_type<solver::libsolv::Database>,
+                                                           channel_context.params(),
+                                                           solver::libsolv::Database::Settings{
+                                                               ctx.experimental_matchspec_parsing
+                                                                   ? solver::libsolv::MatchSpecParser::Mamba
+                                                                   : solver::libsolv::MatchSpecParser::Libsolv }
+                                                       );
 
             if (!ctx.experimental_resolvo_solver)
             {

libmamba/src/api/remove.cpp

@@ -136,19 +136,20 @@ namespace mamba
             }
             PrefixData& prefix_data = exp_prefix_data.value();
 
-            solver::libsolv::Database database{
-                channel_context.params(),
-                {
-                    ctx.experimental_matchspec_parsing ? solver::libsolv::MatchSpecParser::Mamba
-                                                       : solver::libsolv::MatchSpecParser::Libsolv,
-                },
-            };
             solver::DatabaseVariant db_variant = ctx.experimental_resolvo_solver
                                                      ? solver::DatabaseVariant(
                                                            std::in_place_type<solver::resolvo::Database>,
                                                            channel_context.params()
                                                        )
-                                                     : solver::DatabaseVariant(std::move(database));
+                                                     : solver::DatabaseVariant(
+                                                           std::in_place_type<solver::libsolv::Database>,
+                                                           channel_context.params(),
+                                                           solver::libsolv::Database::Settings{
+                                                               ctx.experimental_matchspec_parsing
+                                                                   ? solver::libsolv::MatchSpecParser::Mamba
+                                                                   : solver::libsolv::MatchSpecParser::Libsolv,
+                                                           }
+                                                       );
 
             if (!ctx.experimental_resolvo_solver)
             {