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

Merge branch 'push-meta' into 'master'

Browse Source 
Fix pushing metapackages

See merge request redox-os/redox!2126
This commit is contained in:
Jeremy Soller 2026-05-07 06:07:35 -06:00
commit 25d8916ed4
2 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/cook/package.rs
View File

@ -251,38 +251,26 @@ pub fn package_handle_push(
let archive_toml = archive_path.with_extension("toml");
let pkey_path = "build/id_ed25519.pub.toml";
let pkg_toml = Package::from_file(&archive_toml)?;
match state.installed.get(&pkg_toml.name) {
Some(s) if !reinstall && pkg_toml.blake3 == s.blake3 => Ok(true),
Some(s) => {
// "local" is what remote name from installer is hardcoded into
let remote_name = "local".to_string();
let install_state =
InstallState::from_package(&pkg_toml, remote_name, s.manual, s.dependents.clone());
// TODO: use pkgar::replace unless forced reinstall
pkgar::extract(pkey_path, &archive_path, sysroot_dir)?;
state.installed.insert(pkg_toml.name.clone(), install_state);
Ok(false)
}
// "local" is what remote name from installer is hardcoded into
let remote_name = "local".to_string();
let (cached, pstate) = match state.installed.get(&pkg_toml.name) {
Some(s) if !reinstall && pkg_toml.blake3 == s.blake3 => (true, None),
Some(s) => (false, Some((s.manual, s.dependents.clone()))),
None => {
// "local" is what remote name from installer is hardcoded into
let remote_name = "local".to_string();
// TODO: Handle manual & depedents
let install_state =
InstallState::from_package(&pkg_toml, remote_name, true, BTreeSet::new());
pkgar::extract(pkey_path, &archive_path, sysroot_dir)?;
// TODO: Inject dependencies
// TODO: Check if we need to inject remote key
state.installed.insert(pkg_toml.name.clone(), install_state);
Ok(false)
// TODO: Handle manual & dependents
(false, Some((true, BTreeSet::new())))
}
};
if let Some((manual, dependents)) = pstate {
if archive_path.is_file() {
pkgar::extract(pkey_path, &archive_path, sysroot_dir)?;
}
// TODO: Check if we need to inject remote key
let install_state = InstallState::from_package(&pkg_toml, remote_name, manual, dependents);
state.installed.insert(pkg_toml.name.clone(), install_state);
}
Ok(cached)
}

12
src/cook/tree.rs
View File

@ -62,10 +62,14 @@ pub fn walk_tree_entry(
let (_, pkg_path, pkg_toml) = cook_recipe.stage_paths();
let deduped = visited.contains(package_name);
let entry = match (std::fs::metadata(&pkg_path), deduped) {
(_, true) => WalkTreeEntry::Deduped,
(Ok(meta), _) => WalkTreeEntry::Built(&pkg_path, meta.len()),
(Err(_), _) => WalkTreeEntry::NotBuilt,
let entry = if deduped {
WalkTreeEntry::Deduped
} else {
match (std::fs::metadata(&pkg_path), pkg_toml.is_file()) {
(Ok(meta), _) => WalkTreeEntry::Built(&pkg_path, meta.len()),
(Err(_), true) => WalkTreeEntry::Built(&pkg_path, 0),
(Err(_), false) => WalkTreeEntry::NotBuilt,
}
};
let cached = op(package_name, prefix, is_last, &entry)?;