From 5e3f9fb1457299215f1777603ef9d3e2f81986ff Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 14 May 2012 23:21:02 -0700 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ build-aux/bootstrap | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64c63bc52..12c39f62e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-05-14 Paul Eggert + 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 diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 78f335eda..ce37a2c06 100755 --- 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 @@ insert_sorted_if_absent() { 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 @@ if test $with_gettext = yes || test $use_libtool = 1; then $LIBTOOLIZE $install --copy fi - set -x find . ! -type d -print | sort >$tempbase.1 old_IFS=$IFS IFS=$nl @@ -827,7 +826,6 @@ if test $with_gettext = yes || test $use_libtool = 1; then } done IFS=$old_IFS - set +x rm -f $tempbase.0 $tempbase.1 trap - 1 2 13 15 -- 2.11.0