Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion crates/rattler_repodata_gateway/src/gateway/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ impl RepoDataQuery {

for (_, dependencies) in record.package_record.extra_depends.iter() {
for dependency in dependencies {
let dependency_name = PackageName::new_unchecked(dependency.split_once(' ').unwrap_or((dependency, "")).0);
let dependency_name = package_name_from_match_spec_str(dependency);
if seen.insert(dependency_name.clone()) {
pending_package_specs.insert(dependency_name.clone(), SourceSpecs::Transitive);
}
Expand Down Expand Up @@ -412,3 +412,25 @@ impl IntoFuture for NamesQuery {
self.execute().boxed()
}
}

fn package_name_from_match_spec_str(spec: &str) -> PackageName {
let package_name_str = spec
.split_once(|c: char| c.is_whitespace() || matches!(c, '>' | '<' | '=' | '!' | '~'))
.map_or(spec, |(name, _)| name);
PackageName::new_unchecked(package_name_str)
}

#[cfg(test)]
mod test {
use rstest::*;

#[rstest]
#[case("pillow", "pillow")]
#[case("pillow >=10", "pillow")]
#[case("pillow>=10,<12", "pillow")]
#[case("pillow >=10, <12", "pillow")]
fn test_package_name_from_match_spec_str(#[case] spec: &str, #[case] expected: &str) {
let package_name = super::package_name_from_match_spec_str(spec);
assert_eq!(package_name.as_source(), expected);
}
}