diff --git a/Cargo.lock b/Cargo.lock index 5853fb1..0097781 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -418,7 +418,7 @@ checksum = "807800ff3288b621186fe0a8f3392c4652068257302709c24efd918c3dffcdc2" [[package]] name = "depot" -version = "0.25.1" +version = "0.26.0" dependencies = [ "anyhow", "ar", diff --git a/Cargo.toml b/Cargo.toml index 62ee7ad..0523a10 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "depot" -version = "0.25.1" +version = "0.26.0" edition = "2024" [lints.rust] diff --git a/meson.build b/meson.build index 9138387..9ae3bbc 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'depot', - version: '0.25.1', + version: '0.26.0', meson_version: '>=0.60.0', default_options: ['buildtype=release'], ) diff --git a/src/install/scripts.rs b/src/install/scripts.rs index 7419df7..af4fff1 100644 --- a/src/install/scripts.rs +++ b/src/install/scripts.rs @@ -692,11 +692,7 @@ fn resolve_hook_script(script_dir: &Path, hook: Hook, pkg_name: &str) -> Result< if is_lib32_package(pkg_name) { let label = format!("{} (lib32)", hook.canonical_name()); - if let Some(path) = - resolve_hook_from_candidates(script_dir, &label, hook.lib32_candidate_names())? - { - return Ok(Some(path)); - } + return resolve_hook_from_candidates(script_dir, &label, hook.lib32_candidate_names()); } resolve_hook_from_candidates(script_dir, hook.canonical_name(), hook.candidate_names()) @@ -808,19 +804,11 @@ fn collect_legacy_root_hooks(spec_dir: &Path, pkg_name: &str) -> Result \"$DEPOT_ROOTFS/hook.out\"\n", + ) + .unwrap(); + + let ran = run_hook_if_present(&scripts, Hook::PostInstall, &rootfs, "lib32-foo").unwrap(); + assert!(!ran); + assert!(!rootfs.join("hook.out").exists()); } }