From 1599abe6c06b20aa7d3b77e7caf76dba7e0cd246 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 29 Dec 2008 23:10:55 +0100 Subject: [PATCH] Fix small bug in update of .cvsignore or .gitignore. --- ChangeLog | 6 ++++++ gnulib-tool | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e64c5d4dce..0b68f9b92b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-29 Bruno Haible + + * gnulib-tool (func_import): When generating sed-ignore-removed, handle + files in subdirectories correctly. + Reported by Ralf Wildenhues. + 2008-12-29 Ralf Wildenhues * gnulib-tool (func_update_ignorelist): Use 'join - FILE' diff --git a/gnulib-tool b/gnulib-tool index 391b6b6d22..67ae56c398 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3464,8 +3464,8 @@ s,//*$,/,' if $doit; then echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ - { sed -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed - if test -n "$anchor"; then sed -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi + { sed -e 's,/,\\/,g' -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed + if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi } > "$tmp"/sed-ignore-removed { cat "$destdir/$dir$ignore"~ sed -e "s|^|$anchor|" < "$tmp"/ignore-added -- 2.30.2