changeset 16855:74e5bc0e092e

bootstrap: suppress stderr chatter * build-aux/bootstrap (insert_sorted_if_absent, main program): Omit unnecessary chatter to stderr. The main program chatter was there only inadvertantly.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 14 May 2012 23:21:02 -0700
parents f12c273c2b6c
children dcfd2442bac9
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	bootstrap: suppress stderr chatter
+	* build-aux/bootstrap (insert_sorted_if_absent, main program):
+	Omit unnecessary chatter to stderr.  The main program chatter
+	was there only inadvertantly.
+
 	bootstrap: .gitignore files created by autopoint, libtool
 	I ran into this problem when bootstrapping the latest diffutils.
 	After './bootstrap', 'git status' reported lots of untracked files
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-05-14.21; # UTC
+scriptversion=2012-05-15.06; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -307,7 +307,7 @@
   file=$1
   str=$2
   test -f $file || touch $file
-  echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \
+  echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
     || { echo "$str" | sort_patterns - $file > $file.bak \
       && mv $file.bak $file; } \
     || exit 1
@@ -811,7 +811,6 @@
     $LIBTOOLIZE $install --copy
   fi
 
-  set -x
   find . ! -type d -print | sort >$tempbase.1
   old_IFS=$IFS
   IFS=$nl
@@ -827,7 +826,6 @@
     }
   done
   IFS=$old_IFS
-  set +x
 
   rm -f $tempbase.0 $tempbase.1
   trap - 1 2 13 15