Skip to content
Snippets Groups Projects
Commit b0a6aee6 authored by Christian Engwer's avatar Christian Engwer
Browse files

[dunecontrol]

avoid parsing suggestions twice

[[Imported from SVN: r6836]]
parent 8d8d9955
No related branches found
No related tags found
No related merge requests found
......@@ -338,7 +338,7 @@ _sort_module() {
echo "ERROR: invalid module name $module" >&2
exit 1
fi
if test "x$(eval echo \$SORT_DONE_$module)" != "xyes"; then
if test "x$(eval echo \$SORT_$mode_DONE_$module)" != "xyes"; then
# resolve dependencies
depmode=$(test $mode = SUGS && echo SUGS || echo DEPS)
_check_deps $module DEPS $depmode # it might happen that the DEPS are actually SUGS
......@@ -346,10 +346,10 @@ _sort_module() {
_check_deps $module SUGS SUGS
# insert this module into the list
export SORTEDMODULES_$mode="$(eval echo \$SORTEDMODULES_$mode) $module"
export SORT_$mode_DONE_$module=yes
if test $mode = DEPS; then
# it is sufficient to check that the module hasn't been handled yet,
# as dependencies are handled before suggestions
export SORT_DONE_$module=yes
export SORTEDMODULES="$SORTEDMODULES $module"
export SORTEDMODULES_INFO="$SORTEDMODULES_INFO $module[$mode]"
fi
......
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