Skip to content

Commit

Permalink
num-t64: check Pre-Depends
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastinas committed Apr 5, 2024
1 parent 637e72d commit 0667670
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions src/nmu_t64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ struct BinaryPackage {
version: PackageVersion,
architecture: Architecture,
depends: Option<String>,
#[serde(rename = "Pre-Depends")]
pre_depends: Option<String>,
}

impl BinaryPackage {
Expand Down Expand Up @@ -183,10 +185,6 @@ impl Iterator for BinaryPackageParser<'_> {
if self.skip_arch_all && binary_package.architecture == Architecture::All {
continue;
}
// skip Packages without Depends
let Some(ref dependencies) = binary_package.depends else {
continue;
};

let Ok((source, version)) = binary_package.source_and_version() else {
continue;
Expand All @@ -201,9 +199,20 @@ impl Iterator for BinaryPackageParser<'_> {
continue;
}

for dependency in dependencies
for dependency in binary_package
.depends
.as_ref()
.unwrap_or(&String::default())
.split(", ")
.map(extract_package_from_dependency)
.chain(
binary_package
.pre_depends
.as_ref()
.unwrap_or(&String::default())
.split(", ")
.map(extract_package_from_dependency),
)
{
if !self.library_packages.contains(dependency) {
continue;
Expand Down

0 comments on commit 0667670

Please sign in to comment.