Avoid known, harmless warning.

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 9d0335b4dd3011f663aa1a9456bb5e4ce7836881..ca0ae49acb9f22c494facfedbbbbafb0fd17a7d2 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Bruno Haible  <bruno@clisp.org>
+
+       * convert-archive.in: Remove known 'rlog' warning from error output.
+       (func_version): Update copyright years.
+
 2010-05-09  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.18 released.

diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/misc/convert-archive.in
index e4c0b33faec9c1f2113a2364af302b80915efdd8..ff3d4b245cc28febb2e1f835204e86404c8a411e 100644 (file)
--- a/gettext-tools/misc/convert-archive.in
+++ b/gettext-tools/misc/convert-archive.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -46,7 +46,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>."
 func_version ()
 {
   echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 2009 Free Software Foundation, Inc.
+  echo "Copyright (C) 2009-2010 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
@@ -150,10 +150,12 @@ ba
 }
 /^keyword substitution:/q'
     sed_extract_tags_from_log2='s/^    \([^:]*\):.*/\1/'
+    rlog_harmless_warning_regex="warning: Unknown phrases like \`commitid \.\.\.;' are present\."
     tags=`
-      LC_ALL=C rlog "$cvs_dir"/archive/$witness,v | \
-      sed -n -e "$sed_extract_tags_from_log1" | \
-      sed -e "$sed_extract_tags_from_log2"`
+      ( LC_ALL=C rlog "$cvs_dir"/archive/$witness,v 2>&1 1>&3 \
+        | grep -v "$rlog_harmless_warning_regex" 1>&2 ) 3>&1 \
+      | sed -n -e "$sed_extract_tags_from_log1" \
+      | sed -e "$sed_extract_tags_from_log2"`
     sed_tag_to_version='s/_/./g'
     for tag in $tags; do
       if test $tag != release; then