There is a minor whitespace diff in gnulib-cache.m4 for avoided
modules. For example, after running 'test-emacs-1.sh', we see
(omitting many entries because long lines):
--- ./test-emacs-1.result/m4/gnulib-cache.m4 2024-03-21 17:47:04.460177611
-0700
+++ tmp1158700-result/m4/gnulib-cache.m4 2024-03-21 17:48:31.799297501
-0700
@@ -292,7 +292,7 @@
warnings
year2038
])
-gl_AVOID([ btowc ... wctype-h])
+gl_AVOID([btowc ... wctype-h])
The gnulib-tool.sh script accepts modules and adds them to string with
a leading space. Since there isn't a special case for the first
module, a leading space is placed in gl_AVOID.
I prefer not having the extra space, but since it would require
updating the test cases, it may just be easier to add one to
gnulib-tool.py. Feel free to pick whichever solution that you prefer.
:)
1.
diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index f1a36ec023..aaab975073 100755
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -1404,7 +1404,11 @@ func_determine_path_separator
shift ;;
--avoid=* )
arg=`echo "X$1" | sed -e 's/^X--avoid=//'`
- func_append avoidlist " $arg"
+ if test -z "$avoidlist"; then
+ avoidlist="$arg"
+ else
+ func_append avoidlist " $arg"
+ fi
shift ;;
2.
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index 66b63ef08e..67883c0700 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -574,7 +574,7 @@ class GLImport(object):
emit += 'gl_WITH_UNPORTABLE_TESTS\n'
if self.config.checkInclTestCategory(TESTS['all-tests']):
emit += 'gl_WITH_ALL_TESTS\n'
- emit += 'gl_AVOID([%s])\n' % ' '.join(avoids)
+ emit += 'gl_AVOID([ %s])\n' % ' '.join(avoids)
emit += 'gl_SOURCE_BASE([%s])\n' % sourcebase
emit += 'gl_M4_BASE([%s])\n' % m4base
emit += 'gl_PO_BASE([%s])\n' % pobase
Collin
