[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] Fix capitalization of error messages, reword one message.
From: |
Ralf Wildenhues |
Subject: |
[PATCH 2/5] Fix capitalization of error messages, reword one message. |
Date: |
Sun, 11 Apr 2010 22:31:45 +0200 |
User-agent: |
Mutt/1.5.20 (2009-10-28) |
* lib/Automake/Variable.pm (define): Do not capitalize the first
word in the error message.
* automake.in (require_file_internal): Likewise. Also, reword
and line-wrap for better readability.
* tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
Adjust tests.
Signed-off-by: Ralf Wildenhues <address@hidden>
---
A bit better GCS compliance.
Cheers,
Ralf
ChangeLog | 8 ++++++++
automake.in | 5 +++--
lib/Automake/Variable.pm | 4 ++--
tests/distcom7.test | 4 ++--
tests/pluseq5.test | 7 ++++---
tests/pluseq9.test | 6 +++---
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9a0b332..6ed3c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-04-11 Ralf Wildenhues <address@hidden>
+ Fix capitalization of error messages, reword one message.
+ * lib/Automake/Variable.pm (define): Do not capitalize the first
+ word in the error message.
+ * automake.in (require_file_internal): Likewise. Also, reword
+ and line-wrap for better readability.
+ * tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
+ Adjust tests.
+
Fix connected warnings about obsolete exeext override.
* lib/Automake/Rule.pm (define): Merge two warnings that belong
together, by setting the 'partial' flag for the first one.
diff --git a/automake.in b/automake.in
index d5e3ec2..4a753db 100644
--- a/automake.in
+++ b/automake.in
@@ -7914,8 +7914,9 @@ sub require_file_internal ($$$@)
# the top level Makefile. Furthermore Automake
# hasn't been asked to create the Makefile.in
# that distributes the aux dir files.
- error ($where, 'Please make a full run of automake'
- . " so $fullfile gets distributed.");
+ error ($where, 'please rerun automake without '
+ . "Makefile arguments\n"
+ . "so $fullfile gets distributed.");
}
}
}
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index c340dc7..bf44c38 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -996,10 +996,10 @@ sub define ($$$$$$$$)
if (! $undef_cond->false)
{
error ($where,
- "Cannot apply `+=' because `$var' is not defined "
+ "cannot apply `+=' because `$var' is not defined "
. "in\nthe following conditions:\n "
. join ("\n ", map { $_->human } $undef_cond->conds)
- . "\nEither define `$var' in these conditions,"
+ . "\neither define `$var' in these conditions,"
. " or use\n`+=' in the same conditions as"
. " the definitions.");
}
diff --git a/tests/distcom7.test b/tests/distcom7.test
index 500c909..646275c 100755
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,4 +38,4 @@ echo bin_PROGRAMS = foo > subdir/Makefile.am
$ACLOCAL
AUTOMAKE_fails --add-missing subdir/Makefile
-grep 'full run' stderr
+grep 'without.*Makefile.*arguments' stderr
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 1f1c98c..5efe34e 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
+# Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,10 +35,10 @@ AUTOMAKE_fails
# We expect the following diagnostic:
#
-# Makefile.am:4: Cannot apply `+=' because `INCLUDES' is not defined in
+# Makefile.am:4: cannot apply `+=' because `INCLUDES' is not defined in
# Makefile.am:4: the following conditions:
# Makefile.am:4: !CHECK
-# Makefile.am:4: Either define `INCLUDES' in these conditions, or use
+# Makefile.am:4: either define `INCLUDES' in these conditions, or use
# Makefile.am:4: `+=' in the same conditions as the definitions.
# Is !CHECK mentioned?
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 31e1c8d..b7d6643 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -55,10 +55,10 @@ AUTOMAKE_fails
# We expect the following diagnostic:
#
-# Makefile.am:19: Cannot apply `+=' because `B' is not defined in
+# Makefile.am:19: cannot apply `+=' because `B' is not defined in
# Makefile.am:19: the following conditions:
# Makefile.am:19: !COND1 and !COND3
-# Makefile.am:19: Either define `B' in these conditions, or use
+# Makefile.am:19: either define `B' in these conditions, or use
# Makefile.am:19: `+=' in the same conditions as the definitions.
#
# It would be nice if Automake could print only COND3_FALSE and
--
1.7.0.rc1.161.g90487
- [PATCH 0/5] Prepend 'error: ' or 'warning: ' to messages., Ralf Wildenhues, 2010/04/11
- [PATCH 1/5] Fix connected warnings about obsolete exeext override., Ralf Wildenhues, 2010/04/11
- [PATCH 2/5] Fix capitalization of error messages, reword one message.,
Ralf Wildenhues <=
- [PATCH 3/5] Prepend type to warning, error, and fatal messages., Ralf Wildenhues, 2010/04/11
- [PATCH 4/5] Ensure we don't print 'warning:' or 'error:' twice., Ralf Wildenhues, 2010/04/11
- [PATCH 5/5] Print 'warnings are treated as errors' note if needed., Ralf Wildenhues, 2010/04/11
- Re: [PATCH 0/5] Prepend 'error: ' or 'warning: ' to messages., Bruno Haible, 2010/04/11