mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
timeout: display signal 0 as '0' instead of 'EXIT' in verbose mode (#10194)
This is done to match a change in GNU coreutils after v9.9
This commit is contained in:
@@ -210,7 +210,11 @@ fn catch_sigterm() {
|
||||
/// Report that a signal is being sent if the verbose flag is set.
|
||||
fn report_if_verbose(signal: usize, cmd: &str, verbose: bool) {
|
||||
if verbose {
|
||||
let s = signal_name_by_value(signal).unwrap();
|
||||
let s = if signal == 0 {
|
||||
"0".to_string()
|
||||
} else {
|
||||
signal_name_by_value(signal).unwrap().to_string()
|
||||
};
|
||||
show_error!(
|
||||
"{}",
|
||||
translate!("timeout-verbose-sending-signal", "signal" => s, "command" => cmd.quote())
|
||||
|
||||
@@ -58,7 +58,7 @@ fn test_verbose() {
|
||||
new_ucmd!()
|
||||
.args(&[verbose_flag, "-s0", "-k.1", ".1", "sleep", "1"])
|
||||
.fails()
|
||||
.stderr_only("timeout: sending signal EXIT to command 'sleep'\ntimeout: sending signal KILL to command 'sleep'\n");
|
||||
.stderr_only("timeout: sending signal 0 to command 'sleep'\ntimeout: sending signal KILL to command 'sleep'\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user