X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=2ea257dba6093b6eac97cdffcf7412ce2e766698;hb=3d9dacd0b6e872d8caa7fd2c757767b3288d80c3;hp=1108ce0949f7474c51952ae76fc6f272fae6e6e8;hpb=eba129a7c621bda4516a9ad1a18e2e795b7932b3;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 1108ce094..2ea257dba 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-08-26 10:31:22 $' +cvsdatestamp='$Date: 2007-08-26 10:36:54 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -2230,7 +2230,7 @@ func_import () sed_take_first_column='s,'"$delimiter"'.*,,' for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do # Remove the file. Do nothing if the user already removed it. - if test -f "$destdir/$g"; then + if test -f "$destdir/$g" || test -h "$destdir/$g"; then if $doit; then echo "Removing file $g (backup in ${g}~)" mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"