From 66a93b54333be45b5c3e382ad42aa307f551a3f1 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 15 Nov 2024 15:49:25 +0100 Subject: Add missing llnl.* imports (#47618) --- lib/spack/spack/modules/common.py | 4 ++-- lib/spack/spack/stage.py | 1 + 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, -- cgit v1.2.3-70-g09d2