Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16714:2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
* gnulib-tool (func_add_file, func_update_file, func_import): Use
"cmp -s", not "cmp > /dev/null".
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 24 Mar 2012 16:41:21 +0100 |
parents | 5090324ee0c8 |
children | be14d9f76493 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-24 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Avoid unintended error output from 'cmp'. + * gnulib-tool (func_add_file, func_update_file, func_import): Use + "cmp -s", not "cmp > /dev/null". + 2012-03-23 Stefano Lattarini <stefano.lattarini@gmail.com> gnulib-tool: fix imprecise comments w.r.t. an automake bug
--- a/gnulib-tool +++ b/gnulib-tool @@ -3151,7 +3151,7 @@ || { test -n "$lsymbolic" \ && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ && test -z "$lookedup_tmp" \ - && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + && cmp -s "$lookedup_file" "$tmpfile"; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" @@ -3180,7 +3180,7 @@ # - already_present nonempty if the file should already exist, empty otherwise func_update_file () { - if cmp "$destdir/$g" "$tmpfile" > /dev/null; then + if cmp -s "$destdir/$g" "$tmpfile"; then : # The file has not changed. else # Replace the file. @@ -3195,7 +3195,7 @@ || { test -n "$lsymbolic" \ && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ && test -z "$lookedup_tmp" \ - && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + && cmp -s "$lookedup_file" "$tmpfile"; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" @@ -4909,7 +4909,7 @@ modules="$main_modules" func_emit_lib_Makefile_am > "$tmpfile" if test -f "$destdir"/$sourcebase/$makefile_am; then - if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$sourcebase/$makefile_am "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4940,7 +4940,7 @@ func_lookup_file build-aux/po/$file cat "$lookedup_file" > "$tmpfile" if test -f "$destdir"/$pobase/$file; then - if cmp "$destdir"/$pobase/$file "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$pobase/$file "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4967,7 +4967,7 @@ func_dest_tmpfilename $pobase/Makevars func_emit_po_Makevars > "$tmpfile" if test -f "$destdir"/$pobase/Makevars; then - if cmp "$destdir"/$pobase/Makevars "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$pobase/Makevars "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4993,7 +4993,7 @@ func_dest_tmpfilename $pobase/POTFILES.in func_emit_po_POTFILES_in > "$tmpfile" if test -f "$destdir"/$pobase/POTFILES.in; then - if cmp "$destdir"/$pobase/POTFILES.in "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$pobase/POTFILES.in "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -5042,7 +5042,7 @@ } ) > "$tmpfile" if test -f "$destdir"/$pobase/LINGUAS; then - if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$pobase/LINGUAS "$tmpfile"; then rm -f "$tmpfile" else echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)" @@ -5131,7 +5131,7 @@ fi ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-cache.m4; then - if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -5270,7 +5270,7 @@ echo "])" ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-comp.m4; then - if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -5305,7 +5305,7 @@ modules="$testsrelated_modules" func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$tmpfile" if test -f "$destdir"/$testsbase/$makefile_am; then - if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$testsbase/$makefile_am "$tmpfile"; then rm -f "$tmpfile" else if $doit; then