]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
options: consistently use return statuses to report errors (more)
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 10 May 2013 23:13:46 +0000 (01:13 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 10 May 2013 23:13:46 +0000 (01:13 +0200)
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 <stefano.lattarini@gmail.com>
lib/Automake/Options.pm

index b0693bdb92763108fff9d59ee3bde1554e121ea9..a6a42a7bf4c5d8efb27549ff3e1135021b5d37d4 100644 (file)
@@ -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+)$/)
         {