[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] {maint} options: tiny simplification in dealing with incompatible

From: Stefano Lattarini
Subject: [FYI] {maint} options: tiny simplification in dealing with incompatible version
Date: Sat, 11 May 2013 10:35:50 +0200

* lib/Automake/ (_process_option_list): Here, when an
incompatible version number option is detected, there's no need
to call error() with the "uniq_scope => US_GLOBAL" switch.
In fact, if the same incompatible version number is specified in
AUTOMAKE_OPTIONS in both (say) '' and 'sub/',
we want each such erroneous usage reported separately, rather than
just the first time it is encountered (as we'd expect to happen
when "uniq_scope => US_GLOBAL" is used).
Ideally, this change should have been folded into the similar
commit 'v1.13.1d-129-gf7ef16f', but we noticed that too late.
Oh well.

Signed-off-by: Stefano Lattarini <address@hidden>
 lib/Automake/ | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Automake/ b/lib/Automake/
index db5661c..fab33f3 100644
--- a/lib/Automake/
+++ b/lib/Automake/
@@ -379,8 +379,7 @@ sub _process_option_list (\%@)
           # Got a version number.
           if (Automake::Version::check ($VERSION, $&))
-              error ($where, "require Automake $_, but have $VERSION",
-                     uniq_scope => US_GLOBAL);
+              error ($where, "require Automake $_, but have $VERSION");
               $ret = 0;

reply via email to

[Prev in Thread] Current Thread [Next in Thread]