From 0762e23a4187592bc8e8fa064dbe1a08c77d2409 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 5 Sep 2005 11:40:42 +0000 Subject: [PATCH] Fix cmp invocation. --- ChangeLog | 7 ++++++- gnulib-tool | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e0abe81e..e2a30b4e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ +2005-09-05 Bruno Haible + + * gnulib-tool (func_import): Fix comparison in handling of symbolic + links. + 2005-09-04 Martin Lambers (tiny change) * modules/size_max (Makefile.am): Add size_max.h 2005-09-04 Derek Price - * gnulib-tool: Fix reversed $symbolic logic. + * gnulib-tool (func_import): Fix reversed $symbolic logic. 2005-09-03 Simon Josefsson diff --git a/gnulib-tool b/gnulib-tool index 5f8e9dc29..757ad7c8e 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-09-04 15:57:34 $' +cvsdatestamp='$Date: 2005-09-05 11:40:42 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -988,7 +988,7 @@ func_import () # frequently that developers don't put autogenerated files into CVS. echo "Copying file $g2" test -n "$dry_run" && dry=echo - if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then + if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp" > /dev/null; then func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2" else $dry mv -f "$destdir/$g2.tmp" "$destdir/${g2}" || func_fatal_error "failed" -- 2.11.0