Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lasse Hinrichsen-Bischoff
dune-common
Commits
50926312
Commit
50926312
authored
11 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
[dunecontrol,release] Make warnings about superseeded modules less verbose.
parent
9afabdcd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/dunecontrol
+9
-0
9 additions, 0 deletions
bin/dunecontrol
lib/dunemodules.lib
+1
-9
1 addition, 9 deletions
lib/dunemodules.lib
with
10 additions
and
9 deletions
bin/dunecontrol
+
9
−
0
View file @
50926312
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
lib/dunemodules.lib
+
1
−
9
View file @
50926312
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment