Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12819:4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 25 Jan 2010 22:37:52 +0100 |
| parents | fd3088c281ee |
| children | c26a1084fbae |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-25 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Make warning diagnostics consistent. + * gnulib-tool (func_warning): New function. + Use it everywhere where gnulib-tool produces output to stderr and it is + not a fatal error. + 2010-01-25 Bruno Haible <bruno@clisp.org> Fix test dependencies.
--- a/gnulib-tool +++ b/gnulib-tool @@ -490,6 +490,13 @@ func_exit 1 } +# func_warning message +# Outputs to stderr a warning message, +func_warning () +{ + echo "gnulib-tool: warning: $1" 1>&2 +} + # func_readlink SYMLINK # outputs the target of the given symlink. if (type -p readlink) > /dev/null 2>&1; then @@ -1135,7 +1142,7 @@ func_exit 1 fi if test -z "$pobase" && test -n "$po_domain"; then - echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2 + func_warning "--po-domain has no effect without a --po-base option" fi # Determine the minimum supported autoconf version from the project's @@ -1311,7 +1318,7 @@ # Verify that building the module description with 'patch' succeeds. func_lookup_file "modules/$module" else - echo "gnulib-tool: module $module doesn't exist" 1>&2 + func_warning "module $module doesn't exist" module= fi } @@ -1689,7 +1696,7 @@ # Duplicate dependencies are harmless, but Jim wants a warning. duplicated_deps=`echo "$deps" | LC_ALL=C sort | LC_ALL=C uniq -d` if test -n "$duplicated_deps"; then - echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2 + func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` fi for dep in $deps; do if test -n "$incobsolete" \ @@ -3885,19 +3892,19 @@ GPLv2+) case "$license" in GPLv2+ | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPL) case "$license" in LGPL | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPLv2+) case "$license" in LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; esac