Skip to content

Commit 40c8958

Browse files
committed
Fix several typos found with codespell
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent bc51f3e commit 40c8958

File tree

17 files changed

+21
-21
lines changed

17 files changed

+21
-21
lines changed

doc/example/compiler-etc-dependencies/flavours/intelmpi/default

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#
88
# This is really a placeholder modulefile, does not define anything
9-
# though we must iniitial flavours and do a cleanup to properly
9+
# though we must initial flavours and do a cleanup to properly
1010
# support switching of modules depending on this module
1111

1212
# Initialise "flavours"

doc/example/compiler-etc-dependencies/tcllib/LoadedMpiMatches.tcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Please unload the MPI library and try again."
4747

4848
# If no MPI is loaded, then load it if $loadIt (this is valid even
4949
# in edge cases of nompi or intelmpi), prereq it if $requireIt,
50-
# abd return
50+
# and return
5151
if { $loaded eq {} } {
5252
if { $loadIt } {
5353
RequireMPI $wanted $noLoadIntel

doc/source/cookbook/modulefiles-in-git.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ First convert the existing Modulefiles into a git repo at
6767
cd /home/modules/modulefiles
6868
git init
6969
git add .
70-
git commit -m 'Initial checkin of existing Modulefiles'
70+
git commit -m 'Initial checking of existing Modulefiles'
7171
# Enable updates when receiving pushes:
7272
git config --local receive.denyCurrentBranch updateInstead
7373

doc/source/cookbook/tips-for-code-reuse.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ this is done by:
239239

240240
The above was only a simple example of what could be done, but it shows how
241241
modulefiles can leverage the fact that the modulefiles are evaluated in a
242-
full programming language to increase the amount of code re-use, which should
242+
full programming language to increase the amount of code reuse, which should
243243
reduce errors, improve consistency, and in general make things more manageable
244244
over the long run.
245245

doc/source/design/module-cache.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ access entries are tested if they match search query. Test is done through
321321
``findModulesFromDirsAndFiles`` procedure which corresponds to the walk down
322322
code extracted from ``findModules``.
323323

324-
This specific interpreter is re-used between different cache file evaluations.
324+
This specific interpreter is reused between different cache file evaluations.
325325
As for modulefile interpreter, a consistency check is performed before each
326326
reuse to test that the cache file-specific commands have not be rewritten
327327
during previous cache file evaluation.

doc/source/module.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2982,7 +2982,7 @@ or consequence of a module action. The inherited tags are:
29822982
the result of an :subcmd:`avail` sub-command.
29832983
* ``hidden-loaded``: module has been set *hidden once loaded* through the use
29842984
of the :mfcmd:`module-hide --hidden-loaded<module-hide>` command thus it is
2985-
not reported bu default among the result of a :subcmd:`list` sub-command.
2985+
not reported by default among the result of a :subcmd:`list` sub-command.
29862986
* ``loaded``: module is currently loaded
29872987
* ``nearly-forbidden``: module will soon be *forbidden*, which has been set
29882988
through the use of the :mfcmd:`module-forbid` command. Thus this module

script/gitlog2changelog.py.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ for line in fin:
159159

160160
# Assemble the actual commit message line(s) and limit the line length
161161
# to 80 characters.
162-
# Avoid printing same (or equivalen) filename lists twice, if commit
162+
# Avoid printing same (or equivalent) filename lists twice, if commit
163163
# message starts with them.
164164
if message.startswith(files + ":"):
165165
commitLine = "* " + message

tcl/subcmd.tcl.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ proc cmdModuleSwitch {uasked tag_list old {new {}}} {
622622
proc cmdModuleSave {{coll default}} {
623623
if {![areModuleConstraintsSatisfied]} {
624624
reportErrorAndExit {Cannot save collection, some module constraints are\
625-
not satistied}
625+
not satisfied}
626626
}
627627

628628
# format collection content, version number of modulefile are saved if
@@ -1805,7 +1805,7 @@ proc cmdModuleReload {} {
18051805
# no reload of all loaded modules attempt if constraints are violated
18061806
if {![areModuleConstraintsSatisfied]} {
18071807
reportError {Cannot reload modules, some of their constraints are not\
1808-
satistied}
1808+
satisfied}
18091809
} else {
18101810
pushSettings
18111811
if {[set errCode [catch {

testsuite/modulefiles/dirmodalias/1.0

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# }R%
2121
# Comment: %C{
2222
# Test the correct handling of module alias whose name
23-
# superseeds an existing directory name
23+
# supersedes an existing directory name
2424
# }C%
2525
#
2626
##############################################################################

testsuite/modulefiles/dirmodvirt/1.0

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# }R%
2121
# Comment: %C{
2222
# Test the correct handling of virtual module whose name
23-
# superseeds an existing directory name
23+
# supersedes an existing directory name
2424
# }C%
2525
#
2626
##############################################################################

testsuite/modules.00-init/005-init_ts.exp

+2-2
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ set err_emptymodname "$error_msgs: Invalid empty module name"
400400
set err_emptycollname "$error_msgs: $msg_collnameempty"
401401
set err_emptydirname "$error_msgs: Invalid empty directory name"
402402
set err_emptyfilename "$error_msgs: $msg_filenameempty"
403-
set err_unsatreload "$error_msgs: Cannot reload modules, some of their constraints are not satistied"
403+
set err_unsatreload "$error_msgs: Cannot reload modules, some of their constraints are not satisfied"
404404
set err_nodefault "$error_msgs: No default version defined for "
405405
set err_evalabort "$error_msgs: Module evaluation aborted"
406406
set warn_evalabort "$warn_msgs: Module evaluation aborted"
@@ -416,7 +416,7 @@ set err_reqfull "$::error_msgs: Module version must be specified to load module"
416416
set err_nomodloaded "$error_msgs: $msg_nomodloaded"
417417
set err_modfromdiffpathloaded "$error_msgs: Module already loaded from a different modulepath"
418418
set err_save_emptyenv "$::error_msgs: Nothing to save in a collection"
419-
set err_save_unsat "$::error_msgs: Cannot save collection, some module constraints are not satistied"
419+
set err_save_unsat "$::error_msgs: Cannot save collection, some module constraints are not satisfied"
420420
set warn_nostash "$::warn_msgs: No specific environment to save"
421421
set warn_cache_nowritable "$::warn_msgs: Cannot remove cache file, directory is not writable"
422422
set warn_cache_build_nowritable "$::warn_msgs: Cannot build cache file, directory is not writable"

testsuite/modules.00-init/130-auto_handling.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ testouterr_cmd_re "sh" "load --auto $module" $ans $err_trace
7474
testouterr_cmd "sh" "load --no-auto $module" "ERR" $err_pre
7575

7676

77-
# bad environment variable value should not interfer
77+
# bad environment variable value should not interfere
7878
setenv_var MODULES_AUTO_HANDLING foo
7979
if {$install_autohandling eq "y"} {
8080
testouterr_cmd_re "sh" "load $module" $ans $err_trace

testsuite/modules.20-locate/090-memcache.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ DEBUG getModules: use cache entry .*
8282
(.*)+"
8383
testouterr_cmd_re sh {avail -D -t foo foo} OK $tserr
8484

85-
# test situations where cache should or should not be re-used depending
85+
# test situations where cache should or should not be reused depending
8686
# on consecutive similar queries
8787

8888
set tserr "(.*)+

testsuite/modules.20-locate/119-hide-cascading.exp

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ testouterr_cmd sh {avail -t [email protected]} OK {}
239239
unsetenv_var TESTSUITE_HIDE1_CASC4_SET7
240240

241241

242-
# test combinated use of --before/--after/--not-user/--not-group options of module-hide
242+
# test combined use of --before/--after/--not-user/--not-group options of module-hide
243243
setenv_var TESTSUITE_HIDE1_CASC5_SET1 1
244244
testouterr_cmd sh {load hide1@5:} $ans {}
245245
testouterr_cmd sh {avail -t hide1@5:} OK $mp:\nhide1/5.0
@@ -266,7 +266,7 @@ testouterr_cmd sh {avail -t hide1@5:} OK $mp:\nhide1/5.0
266266
unsetenv_var TESTSUITE_HIDE1_CASC5_SET5
267267

268268

269-
# test combinated use of --before/--after/--not-user/--not-group options of module-forbid
269+
# test combined use of --before/--after/--not-user/--not-group options of module-forbid
270270
setenv_var TESTSUITE_HIDE1_CASC6_SET1 1
271271
testouterr_cmd sh {load [email protected]} $ans {}
272272
testouterr_cmd sh {avail -t [email protected]} OK $mp:\nhide1/5.0

testsuite/modules.20-locate/130-mcookie_check_eval.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ testouterr_cmd_re sh "search $modname" ERR $tserr
116116

117117

118118
#
119-
# modulefile with uncompatible magic cookie
119+
# modulefile with incompatible magic cookie
120120
#
121121

122122
set modname mcookie

testsuite/modules.30-cache/010-init_ts.exp

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if {[is-loaded bar]} {
4343
prereq bar
4444
}
4545
}
46-
# uncompatible header modulefile
46+
# incompatible header modulefile
4747
set mod3 foo/3.0
4848
set mod3c {#%Module99
4949
module-whatis "foo"
@@ -151,7 +151,7 @@ if {[is-loaded bar]} {
151151
module-alias quxa/1.0 bar
152152
}
153153
}
154-
# uncompatible header modulerc
154+
# incompatible header modulerc
155155
set modrc3 quxb/.modulerc
156156
set modrc3c {#%Module99
157157
module-version quxb/1.0 default

testsuite/modules.50-cmds/375-deps6.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ setenv_loaded_module [list f20 f21 f18 f19] [list "$mp/f20" "$mp/f21" "$mp/f18"
623623
setenv_var __MODULES_LMPREREQ "f20&f18&f19"
624624
setenv_var __MODULES_LMCONFLICT "f20&f17&f21:f21&f20:f18&f21:f19&f21"
625625

626-
# check module loaded order is preserved between f18 and f19 (prereq definition order should not interfer)
626+
# check module loaded order is preserved between f18 and f19 (prereq definition order should not interfere)
627627
set ans [list]
628628
lappend ans [list set __MODULES_LMCONFLICT "f18&f21:f19&f21:f20&f17&f21"]
629629
lappend ans [list set __MODULES_LMPREREQ "f20&f18&f19"]

0 commit comments

Comments
 (0)