From 116aface3c4b96d037c647f29ac4ae0df6fdad38 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Sat, 20 Aug 2022 14:24:17 +0200 Subject: [PATCH] btrbk: fix regression: wrong deprecation warnings Warning for btrfs_commit_delete is always printed, regardless of the (possibly valid) values. regression in btrbk-0.32.3 687e0508b7 btrbk: tidy deprecation warnings --- btrbk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/btrbk b/btrbk index a2b279a..32c1291 100755 --- a/btrbk +++ b/btrbk @@ -4095,13 +4095,14 @@ sub append_config_option($$$$;@) ERROR "Deprecated (incompatible) option \"$key\" found $error_statement, refusing to continue", $dh->{warn}; return undef; } - my @wmsg = ("Found deprecated option \"$key $value\" $error_statement", $dh->{warn}); + my @wmsg; + push @wmsg, "Found deprecated option \"$key $value\" $error_statement", $dh->{warn} if($dh->{warn}); if(defined($dh->{replace_key})) { $key = $dh->{replace_key}; $value = $dh->{replace_value}; push @wmsg, "Using \"$key $value\""; } - WARN @wmsg; + WARN @wmsg if(@wmsg); if($dh->{FAILSAFE_PRESERVE}) { unless($config_override{FAILSAFE_PRESERVE}) { # warn only once WARN "Entering failsafe mode:";