texinfo ChangeLog util/texi2dvi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/01/13 00:26:17

Modified files:
        .              : ChangeLog 
        util           : texi2dvi 

Log message:
        make check for broken texinfo.tex functional again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1302&r2=1.1303
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.170&r2=1.171

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -b -r1.1302 -r1.1303
--- ChangeLog   12 Jan 2012 18:56:31 -0000      1.1302
+++ ChangeLog   13 Jan 2012 00:26:16 -0000      1.1303
@@ -1,5 +1,11 @@
 2012-01-12  Karl Berry  <address@hidden>
 
+       * util/texi2dvi (run_makeinfo): put the whole version check
+       subshell into the if condition, else the oh-so-helpful set -e
+       defeats the check for a broken texinfo.tex.
+       Report from Jim Meyering, 09 Nov 2011 20:43:08,
+       help from Eric Blake, 9 Nov 2011 21:59:33.
+
        * util/texi2dvi (move_to_dest): support --output in non-clean modes.
 
        * util/tests/automtest.sh: manual test from automake, via

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- util/texi2dvi       12 Jan 2012 18:56:31 -0000      1.170
+++ util/texi2dvi       13 Jan 2012 00:26:17 -0000      1.171
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.170 2012/01/12 18:56:31 karl Exp $
+# $Id: texi2dvi,v 1.171 2012/01/13 00:26:17 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
@@ -34,7 +34,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.170 $'
+rcs_revision='$Revision: 1.171 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -1345,22 +1345,21 @@
     # Check if texinfo.tex performs macro expansion by looking for
     # its version.  The version is a date of the form YEAR-MO-DA.
     # We don't need to use [0-9] to match the digits since anyway
-    # the comparison with $txiprereq, a number, will fail with non
-    # digits.
+    # the comparison with $txiprereq, a number, will fail with non-digits.
     # Run in a temporary directory to avoid leaving files.
     version_test_dir=$t2ddir/version_test
     ensure_dir "$version_test_dir"
-    (
+    if (
        cd "$version_test_dir"
        echo '\input texinfo.tex @bye' >txiversion.tex
        # Be sure that if tex wants to fail, it is not interactive:
        # close stdin.
        $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
-    )
-    if test $? != 0; then
+    ); then :; else
+      report "texinfo.tex appears to be broken:"
       cat "$version_test_dir/txiversion.out"
       cat "$version_test_dir/txiversion.err" >&2
-      error 1 "texinfo.tex appears to be broken, quitting."
+      error 1 "quitting."
     fi
     eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 
txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
     verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' 
..."