From 22b3efa2496678db3ead3fb7f3a92212b8bf109c Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Fri, 22 Mar 2024 02:55:21 +0100 Subject: [PATCH] gnulib-tool.sh: Avoid a redundant space in gl_AVOID in gnulib-cache.m4. * gnulib-tool.sh (avoidlist): Don't add a space before the first module name. --- ChangeLog | 6 ++++++ gnulib-tool.sh | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6cb8526a9..46379c5a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-21 Collin Funk + + gnulib-tool.sh: Avoid a redundant space in gl_AVOID in gnulib-cache.m4. + * gnulib-tool.sh (avoidlist): Don't add a space before the first module + name. + 2024-03-21 Collin Funk gnulib-tool.py: Fix --extract-recursive-link-directive. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index f1a36ec023..d5bbd06f3e 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -1400,11 +1400,19 @@ func_determine_path_separator if test $# = 0; then func_fatal_error "missing argument for --avoid" fi - func_append avoidlist " $1" + if test -z "$avoidlist"; then + avoidlist="$1" + else + func_append avoidlist " $1" + fi 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 ;; --conditional-dependencies | --conditional-dependencie | --conditional-dependenci | --conditional-dependenc | --conditional-dependen | --conditional-depende | --conditional-depend | --conditional-depen | --conditional-depe | --conditional-dep | --conditional-de | --conditional-d | --conditional- | --conditional | --conditiona | --condition | --conditio | --conditi | --condit | --condi | --cond | --con) cond_dependencies=true -- 2.39.5