[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] bootstrap: suppress stderr chatter
From: |
Paul Eggert |
Subject: |
[PATCH] bootstrap: suppress stderr chatter |
Date: |
Mon, 14 May 2012 23:27:00 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 |
---
ChangeLog | 5 +++++
build-aux/bootstrap | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 64c63bc..12c39f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-14 Paul Eggert <address@hidden>
+ 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 78f335e..ce37a2c 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
--
1.7.6.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] bootstrap: suppress stderr chatter,
Paul Eggert <=