From 4c39a5fa96ddc86d5c0d96153fb79696bf5edf0c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 11 May 2013 01:13:46 +0200 Subject: [PATCH] options: consistently use return statuses to report errors (more) This is a follow-up to commit 'v1.13.1d-128-g6e486c5', needed to deal with errors that are only present in the 'master' branch (while the reported commit was on the 'maint' branch). * lib/Automake/Options.pm (_process_option_list): Adjust, where dealing with the removed options 'dist-shar' and 'dist-tarZ'. Signed-off-by: Stefano Lattarini --- lib/Automake/Options.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index b0693bdb9..a6a42a7bf 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -344,6 +344,7 @@ sub _process_option_list (\%@) { error ($where, "support for shar distribution archives has " . "been removed."); + $ret = 0; } # TODO: Remove this special check in Automake 3.0. elsif ($_ eq 'dist-tarZ') @@ -351,6 +352,7 @@ sub _process_option_list (\%@) error ($where, "support for distribution archives compressed " . "with legacy program 'compress' has " . "been removed."); + $ret = 0; } elsif (/^filename-length-max=(\d+)$/) { -- 2.47.2