[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-38-g9381470

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=93814708ba465b5834ec10ec1fb66eceb9674274

The branch, maint has been updated
       via  93814708ba465b5834ec10ec1fb66eceb9674274 (commit)
       via  180158114544e2bf0c11c36f373c28331d0a9ee3 (commit)
      from  e7745eaaac1a5d432f3b39731fb4cd89675432fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 93814708ba465b5834ec10ec1fb66eceb9674274
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 2 09:48:11 2012 +0200

    news: fix typos
    
    * NEWS (Bugs fixed in 1.12.1): Fix botched indentation of an entry,
    add a forgotten "and", remove a redundant "the".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 180158114544e2bf0c11c36f373c28331d0a9ee3
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 2 00:13:10 2012 +0200

    aclocal: error out again on unrecognized arguments
    
    Starting from commit v1.11-662-g52246cc of 2102-02-18, "cmdline parsing:
    move into a dedicated perl module", aclocal has been silently ignoring
    non-option arguments instead of correctly reporting them.
    Fix this regression.
    
    * t/aclocal.sh: Update to catch the regression.
    * aclocal.in (parse_arguments): Explicitly reject non-option arguments.
    * NEWS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    9 +++++++--
 aclocal.in   |    6 ++++++
 t/aclocal.sh |    5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1d4a19e..6eeaf5d 100644
--- a/NEWS
+++ b/NEWS
@@ -64,8 +64,13 @@ Bugs fixed in 1.12.1:
 
 * Bugs introduced by 1.12:
 
-   - Several weaknesses in the Automake's own build system test suite
-     have been fixed.
+  - Several weaknesses in Automake's own build system and test suite
+    have been fixed.
+
+* Bugs introduced by 1.11.3:
+
+  - When given non-option arguments, aclocal rejects them, instead of
+    silently ignoring them.
 
 * Long-standing bugs:
 
diff --git a/aclocal.in b/aclocal.in
index 09e1da4..dfb851b 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -982,6 +982,12 @@ sub parse_arguments ()
   use Automake::Getopt ();
   Automake::Getopt::parse_options %cli_options;
 
+  if (@ARGV > 0)
+    {
+      fatal ("non-option arguments are not accepted: '$ARGV[0]'.\n"
+             . "Try '$0 --help' for more information.");
+    }
+
   if ($print_and_exit)
     {
       print "@system_includes\n";
diff --git a/t/aclocal.sh b/t/aclocal.sh
index 4030b13..3e0cac6 100755
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
@@ -34,6 +34,11 @@ cat stderr >&2
 grep 'unrecognized option.*--unknown-option' stderr
 grep '[Tt]ry.*--help.*for more information' stderr
 
+$ACLOCAL foobar 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'non-option argument.*foobar' stderr
+grep '[Tt]ry.*--help.*for more information' stderr
+
 $ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'unrecognized option.*--ver' stderr


hooks/post-receive
-- 
GNU Automake