[PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 69.

[Collin Funk]

This patch should hopefully stop gnulib-tool.py from mangling
.gitignore files like it did previously. I think I did a decent job
translating the join calls into Python sets, but any criticism is
welcome.

I tried using gnulib-tool.py to bootstrap GNU Inetutils and it handles
the .gitignore files properly now. Now all that is left in that diff
is an extra newline and 'AC_REQUIRE([AM_PROG_CC_C_O])'.

In the test case:
$ find . -name .gitignore~ -type f -print
./import-tests/test-coreutils-1.result/.gitignore~
./import-tests/test-wget2-1.result/.gitignore~

Should these files be removed?

diff --git a/gnulib-tool-tests/init.sh b/gnulib-tool-tests/init.sh
index c3625ca..27c4818 100644
--- a/gnulib-tool-tests/init.sh
+++ b/gnulib-tool-tests/init.sh
@@ -133,6 +138,10 @@ do_import_test ()
   if test -n "$build_aux_dir"; then
     rmdir $build_aux_dir
   fi
+  gitignores=`find $tmp-result -name '.gitignore~' -type f -print`
+  if test -n "$gitignores"; then
+    rm $gitignores
+  fi
   # Remove autom4te.cache directory, since it may depend on the Autoconf 
version or M4 version.
   rm -rf $tmp-result/"$2"/autom4te.cache
   if test $rc != 0; then

Then have something like this in init.sh? I'm not sure if this would
also apply to the test directory tests.

Collin

0001-gnulib-tool.py-Follow-gnulib-tool-changes-part-69.patch
Description: Text Data