Fix behavior when base_url is missing with repodata_version 2

mamba-org · May 27, 2024 · 420b74e · 420b74e
1 parent 7b61593
commit 420b74e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/libmamba/src/solver/libsolv/helpers.cpp b/libmamba/src/solver/libsolv/helpers.cpp
@@ -559,12 +559,6 @@ namespace mamba::solver::libsolv
                 {
                     base_url = std::string(url.value_unsafe());
                 }
-                else
-                {
-                    throw std::invalid_argument(
-                        "'info/base_url' not found in repodata.json file while 'repodata_version': 2"
-                    );
-                }
             }
         }
 

diff --git a/libmamba/tests/src/solver/libsolv/test_database.cpp b/libmamba/tests/src/solver/libsolv/test_database.cpp
@@ -471,15 +471,35 @@ TEST_SUITE("solver::libsolv::database")
         {
             const auto repodata = mambatests::test_data_dir
                                   / "repodata/conda-forge-repodata-version-2-missing-base_url.json";
-            CHECK_THROWS_AS(
-                db.add_repo_from_repodata_json(
-                    repodata,
-                    "https://conda.anaconda.org/conda-forge/linux-64",
-                    "conda-forge",
-                    libsolv::PipAsPythonDependency::No,
-                    libsolv::PackageTypes::CondaOrElseTarBz2
-                ),
-                std::invalid_argument
+            auto repo1 = db.add_repo_from_repodata_json(
+                repodata,
+                "https://conda.anaconda.org/conda-forge/linux-64",
+                "conda-forge",
+                libsolv::PipAsPythonDependency::No,
+                libsolv::PackageTypes::CondaOrElseTarBz2
+            );
+            REQUIRE(repo1.has_value());
+            CHECK_EQ(repo1->package_count(), 2);
+
+            db.for_each_package_in_repo(
+                repo1.value(),
+                [&](const auto& p)
+                {
+                    if (p.name == "_libgcc_mutex")
+                    {
+                        CHECK_EQ(
+                            p.package_url,
+                            "https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2"
+                        );
+                    }
+                    else if (p.name == "bzip2")
+                    {
+                        CHECK_EQ(
+                            p.package_url,
+                            "https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda"
+                        );
+                    }
+                }
             );
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -559,12 +559,6 @@ namespace mamba::solver::libsolv @@
                     {
                         base_url = std::string(url.value_unsafe());
                     }
-                    else
-                    {
-                        throw std::invalid_argument(
-                            "'info/base_url' not found in repodata.json file while 'repodata_version': 2"
-                        );
-                    }
                 }
             }
@@ Expand Down @@