MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-suffix-deps' into 'master'

Browse Source 
Fix dependency listing on optional packages

See merge request redox-os/redox!1751
This commit is contained in:
Jeremy Soller 2025-12-08 06:17:25 -07:00
commit 3471e9910a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cook/package.rs
View File

@ -72,19 +72,8 @@ pub fn package(
.map_err(|err| format!("failed to create pkgar archive: {:?}", err))?;
}
let deps = if let Some(package) = package {
let mut b = BTreeSet::new();
for dep in &package.dependencies {
let dep_name = if dep.name() == "" {
PackageName::new(format!("{}.{}", name.name(), package.name))
.map_err(|e| format!("{}", e))?
} else {
dep.clone()
};
b.insert(dep_name);
}
b.insert(name.clone());
b
let deps = if package.is_some() {
BTreeSet::from([name.without_host()])
} else {
auto_deps.clone()
};
@ -96,7 +85,17 @@ pub fn package(
None => name.clone(),
};
let package_deps = match package {
Some(p) => p.dependencies.clone(),
Some(p) => p
.dependencies
.iter()
.map(|dep| {
if dep.name().is_empty() {
name.with_suffix(dep.suffix())
} else {
dep.clone()
}
})
.collect(),
None => recipe.package.dependencies.clone(),
};
package_toml(