Skip to content
Snippets Groups Projects
Commit 50926312 authored by Markus Blatt's avatar Markus Blatt
Browse files

[dunecontrol,release] Make warnings about superseeded modules less verbose.

parent 9afabdcd
No related branches found
No related tags found
No related merge requests found
......@@ -823,6 +823,15 @@ create_module_list() {
if test "x$SKIPFIRST" = "xyes" ; then
export MODULES=`echo $MODULES " " | cut '--delimiter= ' --fields=2-`
fi
# warn about superseeded modules:
if test -n "$superseeded_modules"; then
# sort moules list and make it unique.
superseeded_modules=$(echo $superseeded_modules | tr ' ' '\n'| sort -u)
echo >&2
echo "The following local modules do superseed the corresponding installed ones:" >&2
echo "$superseeded_modules" >&2
echo >&2
fi
}
# print the module list
......
......@@ -119,19 +119,11 @@ parse_control() {
;;
# installed modules are superseded by locally built modules
noyes)
echo "WARNING: ignoring installed module file" >&2
echo " $path/lib/dunecontrol/$name/$CONTROL" >&2
echo "using previously found locally built module" >&2
echo " $(eval echo \$PATH_$module)/$CONTROL" >&2
module_inst="no"
return
;;
# local modules supersede installed modules
yesno)
echo "WARNING: not using installed module file" >&2
echo " $(eval echo \$PATH_$module)/lib/dunecontrol/$name/$CONTROL" >&2
echo "using locally built module" >&2
echo " $path/$CONTROL" >&2
superseeded_modules="$superseeded_modules $path"
true # do nothing, ignore the previously found module
;;
esac
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment