Fixed channel output in umamba list (#3486)

Fixed channel output in umamba list
This commit is contained in:
Johan Mabille 2024-09-30 21:49:44 +02:00 committed by GitHub
parent b23a07956a
commit f8bfd115df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions

View File

@ -73,13 +73,17 @@ namespace mamba
if (regex.empty() || std::regex_search(pkg_info.name, spec_pat)) if (regex.empty() || std::regex_search(pkg_info.name, spec_pat))
{ {
auto channels = channel_context.make_channel(pkg_info.package_url); auto display_channels = channel_context.make_channel(pkg_info.channel);
assert(channels.size() == 1); // A URL can only resolve to one channel auto url_channels = channel_context.make_channel(pkg_info.package_url);
obj["base_url"] = channels.front().url().str(specs::CondaURL::Credentials::Remove assert(display_channels.size() == 1); // A URL can only resolve to one
// channel
assert(url_channels.size() == 1); // A URL can only resolve to one channel
obj["base_url"] = url_channels.front().url().str(
specs::CondaURL::Credentials::Remove
); );
obj["build_number"] = pkg_info.build_number; obj["build_number"] = pkg_info.build_number;
obj["build_string"] = pkg_info.build_string; obj["build_string"] = pkg_info.build_string;
obj["channel"] = channels.front().display_name(); obj["channel"] = display_channels.front().display_name();
obj["dist_name"] = pkg_info.str(); obj["dist_name"] = pkg_info.str();
obj["name"] = pkg_info.name; obj["name"] = pkg_info.name;
obj["platform"] = pkg_info.platform; obj["platform"] = pkg_info.platform;
@ -113,7 +117,7 @@ namespace mamba
} }
else else
{ {
auto channels = channel_context.make_channel(package.second.package_url); auto channels = channel_context.make_channel(package.second.channel);
assert(channels.size() == 1); // A URL can only resolve to one channel assert(channels.size() == 1); // A URL can only resolve to one channel
formatted_pkgs.channel = channels.front().display_name(); formatted_pkgs.channel = channels.front().display_name();
} }