summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/spack/build_environment.py2
-rw-r--r--lib/spack/spack/cmd/help.py2
-rw-r--r--lib/spack/spack/test/llnl/util/lock.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index fa1ad76274..11cc93a9bd 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -1237,7 +1237,7 @@ def get_package_context(traceback, context=3):
class InstallError(spack.error.SpackError):
"""Raised by packages when a package fails to install.
- Any subclass of InstallError will be annotated by Spack wtih a
+ Any subclass of InstallError will be annotated by Spack with a
``pkg`` attribute on failure, which the caller can use to get the
package for which the exception was raised.
"""
diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py
index 0055c33719..7f6dcdd261 100644
--- a/lib/spack/spack/cmd/help.py
+++ b/lib/spack/spack/cmd/help.py
@@ -69,7 +69,7 @@ spec expression syntax:
hdf5 @B{+mpi} hdf5 with mpi enabled
hdf5 @r{~mpi} hdf5 with mpi disabled
hdf5 @B{+mpi} ^mpich hdf5 with mpi, using mpich
- hdf5 @B{+mpi} ^openmpi@c{@1.7} hdf5 wtih mpi, using openmpi 1.7
+ hdf5 @B{+mpi} ^openmpi@c{@1.7} hdf5 with mpi, using openmpi 1.7
boxlib @B{dim=2} boxlib built for 2 dimensions
libdwarf @g{%intel} ^libelf@g{%gcc}
libdwarf, built with intel compiler, linked to libelf built with gcc
diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py
index 3d91ce075d..e553295e6f 100644
--- a/lib/spack/spack/test/llnl/util/lock.py
+++ b/lib/spack/spack/test/llnl/util/lock.py
@@ -632,7 +632,7 @@ def test_upgrade_read_to_write(private_lock_path):
upgrade is possible.
"""
# ensure lock file exists the first time, so we open it read-only
- # to begin wtih.
+ # to begin with.
touch(private_lock_path)
lock = lk.Lock(private_lock_path)
@@ -665,7 +665,7 @@ def test_upgrade_read_to_write_fails_with_readonly_file(private_lock_path):
# ensure lock file exists the first time
touch(private_lock_path)
- # open it read-only to begin wtih.
+ # open it read-only to begin with.
with read_only(private_lock_path):
lock = lk.Lock(private_lock_path)
assert lock._reads == 0