Skip to content

sum: extract error message from OS #13957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oech3 wants to merge 1 commit into from
+3 −5
Closed

sum: extract error message from OS #13957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/uu/sum/locales/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ sum-help-sysv-compatible = use System V sum algorithm, use 512 bytes blocks

# Error messages
sum-error-is-directory = { $name }: Is a directory
sum-error-no-such-file-or-directory = { $name }: No such file or directory
sum-error-not-a-directory = { $name }: Not a directory
1 change: 0 additions & 1 deletion src/uu/sum/locales/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ sum-help-sysv-compatible = utiliser l'algorithme de somme System V, utiliser des

# Messages d'erreur
sum-error-is-directory = { $name } : Est un répertoire
sum-error-no-such-file-or-directory = { $name } : Aucun fichier ou répertoire de ce type
sum-error-not-a-directory = { $name } : Pas un répertoire
6 changes: 3 additions & 3 deletions src/uu/sum/src/sum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ fn open(name: &OsString) -> UResult<Reader> {
));
}
}
Err(err) => {
if err.kind() == ErrorKind::NotFound {
Err(e) => {
if e.kind() == ErrorKind::NotFound {
return Err(USimpleError::new(
1,
translate!("sum-error-no-such-file-or-directory", "name" => name.maybe_quote()),
format!("{}: {}", name.maybe_quote(), strip_errno(&e)),
));
} else if path.to_string_lossy().ends_with(['/', '\\']) {
return Err(USimpleError::new(
Expand Down
Loading