Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10981:78dea9790e0f
Fix small bug in update of .cvsignore or .gitignore.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 29 Dec 2008 23:10:55 +0100 |
| parents | d54e63808f25 |
| children | 68b73c095d08 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-29 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): When generating sed-ignore-removed, handle + files in subdirectories correctly. + Reported by Ralf Wildenhues. + 2008-12-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * gnulib-tool (func_update_ignorelist): Use 'join - FILE'
--- a/gnulib-tool +++ b/gnulib-tool @@ -3464,8 +3464,8 @@ 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