Modify condition for OCI

mamba-org · Jan 3, 2025 · c16e54c · c16e54c
1 parent 14208d3
commit c16e54c
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/libmamba/src/core/package_fetcher.cpp b/libmamba/src/core/package_fetcher.cpp
@@ -326,11 +326,15 @@ namespace mamba
     std::string PackageFetcher::channel() const
     {
         // Note that in the oci case, the pkg url also implicitly starts with "https://"
-        // but should be included in the first case (with the url containing "ghcr" condition)
+        // but should be included in the first case
+        // (with the url starting with "https://pkg-containers.githubusercontent.com/" condition)
         // TODO We should maybe think of a cleaner way of differentiating all this
         if (!util::starts_with(m_package_info.package_url, "file://")
             && (!util::starts_with(m_package_info.package_url, "https://")
-                || util::contains(m_package_info.package_url, "ghcr")))
+                || util::starts_with(
+                    m_package_info.package_url,
+                    "https://pkg-containers.githubusercontent.com/"
+                )))
         {
             return m_package_info.channel;
         }
@@ -345,11 +349,15 @@ namespace mamba
     std::string PackageFetcher::url_path() const
     {
         // Note that in the oci case, the pkg url also implicitly starts with "https://"
-        // but should be included in the first case (with the url containing "ghcr" condition)
+        // but should be included in the first case
+        // (with the url starting with "https://pkg-containers.githubusercontent.com/" condition)
         // TODO We should maybe think of a cleaner way of differentiating all this
         if (!util::starts_with(m_package_info.package_url, "file://")
             && (!util::starts_with(m_package_info.package_url, "https://")
-                || util::contains(m_package_info.package_url, "ghcr")))
+                || util::starts_with(
+                    m_package_info.package_url,
+                    "https://pkg-containers.githubusercontent.com/"
+                )))
         {
             return util::concat(m_package_info.platform, '/', m_package_info.filename);
         }