Skip to content

Commit 44f1ad0

Browse files
authored
Rollup merge of #161212 - thesamesam:rust-installer-fix-error, r=Mark-Simulacrum
rust-installer/install-template.sh: catch cp(1) error when installing… … files In Gentoo, we had a report [0] of `install.sh` ignoring an error from `cp`: ``` install: installing component 'rustc' cp: failed to clone '.../rust-bin-1.96.1/lib/librustc_driver-07ef66cfcebfb535.so' from '.../rustc/lib/librustc_driver-07ef66cfcebfb535.so': Input/output error install: installing component 'cargo' install: installing component 'rust-std-x86_64-unknown-linux-gnu' install: installing component 'rust-docs' ``` Use `critical_need_ok` after calling cp, as is done elsewhere in the script. [0] https://bugs.gentoo.org/980971
2 parents 143e4b4 + 70ae4e5 commit 44f1ad0

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

‎src/tools/rust-installer/install-template.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ install_components() {
611611
maybe_backup_path "$_file_install_path"
612612

613613
run cp "$_src_dir/$_component/$_file" "$_file_install_path"
614+
critical_need_ok "failed to copy file"
615+
614616
if $_is_bin || test -x "$_src_dir/$_component/$_file"; then
615617
run chmod 755 "$_file_install_path"
616618
else

0 commit comments

Comments
 (0)