Skip to content

Commit d591163

Browse files
committed
env: hardcode config file error message
1 parent 5adc8f3 commit d591163

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

src/uu/env/locales/en-US.ftl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ env-error-unexpected-number = Unexpected character: '{ $char }', expected variab
2828
env-error-expected-brace-or-colon = Unexpected character: '{ $char }', expected a closing brace ('{"}"}') or colon (':') at position { $position }
2929
env-error-cannot-specify-null-with-command = cannot specify --null (-0) with command
3030
env-error-invalid-signal = { $signal }: invalid signal
31-
env-error-config-file = { $file }: { $error }
3231
env-error-variable-name-issue = variable name issue (at { $position }): { $error }
3332
env-error-generic = Error: { $error }
3433
env-error-no-such-file = { $program }: No such file or directory

src/uu/env/locales/fr-FR.ftl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ env-error-expected-brace-or-colon = Caractère inattendu : '{ $char }', accolade
2929
env-error-cannot-specify-null-with-command = impossible de spécifier --null (-0) avec une commande
3030
env-error-invalid-signal = { $signal } : signal invalide
3131
32-
env-error-config-file = { $file } : { $error }
3332
env-error-variable-name-issue = problème de nom de variable (à { $position }) : { $error }
3433
env-error-generic = Erreur : { $error }
3534
env-error-no-such-file = { $program } : Aucun fichier ou répertoire de ce type

src/uu/env/src/env.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,8 @@ fn load_config_file(opts: &mut Options) -> UResult<()> {
319319
Ini::load_from_file(file)
320320
};
321321

322-
let conf = conf.map_err(|e| {
323-
USimpleError::new(
324-
1,
325-
translate!("env-error-config-file", "file" => file.maybe_quote(), "error" => e),
326-
)
327-
})?;
322+
let conf =
323+
conf.map_err(|e| USimpleError::new(1, format!("{}: {e}", file.maybe_quote())))?;
328324

329325
for (_, prop) in &conf {
330326
// ignore all INI section lines (treat them as comments)

0 commit comments

Comments
 (0)