summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-11-15 15:49:25 +0100
committerGitHub <noreply@github.com>2024-11-15 15:49:25 +0100
commit66a93b54333be45b5c3e382ad42aa307f551a3f1 (patch)
tree0db883809912d2866ad1e53359d6b857b23f6da2 /lib
parentb7993317ea8e9319d1b02a901fbfe58447faf910 (diff)
downloadspack-66a93b54333be45b5c3e382ad42aa307f551a3f1.tar.gz
spack-66a93b54333be45b5c3e382ad42aa307f551a3f1.tar.bz2
spack-66a93b54333be45b5c3e382ad42aa307f551a3f1.tar.xz
spack-66a93b54333be45b5c3e382ad42aa307f551a3f1.zip
Add missing llnl.* imports (#47618)
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/modules/common.py4
-rw-r--r--lib/spack/spack/stage.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py
index c770564edd..e62520a6c2 100644
--- a/lib/spack/spack/modules/common.py
+++ b/lib/spack/spack/modules/common.py
@@ -39,7 +39,7 @@ from typing import List, Optional
import llnl.util.filesystem
import llnl.util.tty as tty
-from llnl.util.lang import dedupe, memoized
+from llnl.util.lang import Singleton, dedupe, memoized
import spack.build_environment
import spack.config
@@ -246,7 +246,7 @@ def _generate_upstream_module_index():
return UpstreamModuleIndex(spack.store.STORE.db, module_indices)
-upstream_module_index = llnl.util.lang.Singleton(_generate_upstream_module_index)
+upstream_module_index = Singleton(_generate_upstream_module_index)
ModuleIndexEntry = collections.namedtuple("ModuleIndexEntry", ["path", "use_name"])
diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
index 8b4efcf387..84949c2e28 100644
--- a/lib/spack/spack/stage.py
+++ b/lib/spack/spack/stage.py
@@ -16,6 +16,7 @@ from typing import Callable, Dict, Generator, Iterable, List, Optional, Set
import llnl.string
import llnl.util.lang
+import llnl.util.symlink
import llnl.util.tty as tty
from llnl.util.filesystem import (
can_access,