diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-09-28 18:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 16:21:52 +0000 |
| commit | a236fce31f5d5018c788f51cda50492f1f241cba (patch) | |
| tree | f8a8bfd3e6e32f3d8ebd60e1bf047e237d893314 /lib/spack/llnl/util/lock.py | |
| parent | f77a38a96bef7184f872f4225801ac937e825866 (diff) | |
| download | spack-a236fce31f5d5018c788f51cda50492f1f241cba.tar.gz spack-a236fce31f5d5018c788f51cda50492f1f241cba.tar.bz2 spack-a236fce31f5d5018c788f51cda50492f1f241cba.tar.xz spack-a236fce31f5d5018c788f51cda50492f1f241cba.zip | |
Partial removal of circular dependencies between `spack` and `llnl` (#40090)
Modifications:
- [x] Move `spack.util.string` to `llnl.string`
- [x] Remove dependency of `llnl` on `spack.error`
- [x] Move path of `spack.util.path` to `llnl.path`
- [x] Move `spack.util.environment.get_host_*` to `spack.spec`
Diffstat (limited to 'lib/spack/llnl/util/lock.py')
| -rw-r--r-- | lib/spack/llnl/util/lock.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index 74a325acd2..156300b891 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -14,7 +14,7 @@ from typing import IO, Any, Callable, ContextManager, Dict, Generator, Optional, from llnl.util import lang, tty -import spack.util.string +from ..string import plural if sys.platform != "win32": import fcntl @@ -169,7 +169,7 @@ def _attempts_str(wait_time, nattempts): if nattempts <= 1: return "" - attempts = spack.util.string.plural(nattempts, "attempt") + attempts = plural(nattempts, "attempt") return " after {} and {}".format(lang.pretty_seconds(wait_time), attempts) |