Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/uu/install/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ install-error-mutually-exclusive-target = Options --target-directory and --no-ta
install-error-mutually-exclusive-compare-strip = Options --compare and --strip are mutually exclusive
install-error-missing-file-operand = missing file operand
install-error-missing-destination-operand = missing destination file operand after { $path }
install-error-failed-to-remove = Failed to remove existing file { $path }. Error: { $error }
install-error-failed-to-remove = Failed to remove existing file { $path }. { $error }
install-error-will-not-overwrite-just-created = will not overwrite just-created { $dest } with { $source }

# Warning messages
Expand Down
2 changes: 1 addition & 1 deletion src/uu/install/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ install-error-mutually-exclusive-target = Les options --target-directory et --no
install-error-mutually-exclusive-compare-strip = Les options --compare et --strip sont mutuellement exclusives
install-error-missing-file-operand = opérande de fichier manquant
install-error-missing-destination-operand = opérande de fichier de destination manquant après { $path }
install-error-failed-to-remove = Échec de la suppression du fichier existant { $path }. Erreur : { $error }
install-error-failed-to-remove = Échec de la suppression du fichier existant { $path }. { $error }
install-error-will-not-overwrite-just-created = n'écrasera pas le fichier tout juste créé { $dest } avec { $source }

# Messages d'avertissement
Expand Down
4 changes: 2 additions & 2 deletions src/uu/install/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
{
show_error!(
"{}",
translate!("install-error-failed-to-remove", "path" => target.quote(), "error" => format!("{e:?}"))
translate!("install-error-failed-to-remove", "path" => target.quote(), "error" => strip_errno(&e))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, do you think that we should remove "Error: " from install-error-failed-to-remove? So that it becomes Failed to remove existing file { $path }. { $error } as the GNU error message is install: cannot create directory 'r--': Permission denied

);
}

Expand Down Expand Up @@ -1032,7 +1032,7 @@ fn copy_file(from: &Path, to: &Path) -> UResult<()> {
}
_ => show_error!(
"{}",
translate!("install-error-failed-to-remove", "path" => to.quote(), "error" => format!("{e:?}"))
translate!("install-error-failed-to-remove", "path" => to.quote(), "error" => strip_errno(&e))
),
}
}
Expand Down
Loading