directory_layout.py: remove dependency on global spack.store.STORE (#48460)
This commit is contained in:
parent
35963d7d7d
commit
c424611010
@ -17,7 +17,6 @@
|
|||||||
import spack.hash_types as ht
|
import spack.hash_types as ht
|
||||||
import spack.projections
|
import spack.projections
|
||||||
import spack.spec
|
import spack.spec
|
||||||
import spack.store
|
|
||||||
import spack.util.spack_json as sjson
|
import spack.util.spack_json as sjson
|
||||||
from spack.error import SpackError
|
from spack.error import SpackError
|
||||||
|
|
||||||
@ -91,7 +90,6 @@ def __init__(
|
|||||||
hash_length: Optional[int] = None,
|
hash_length: Optional[int] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.root = root
|
self.root = root
|
||||||
self.check_upstream = True
|
|
||||||
projections = projections or default_projections
|
projections = projections or default_projections
|
||||||
self.projections = {key: projection.lower() for key, projection in projections.items()}
|
self.projections = {key: projection.lower() for key, projection in projections.items()}
|
||||||
|
|
||||||
@ -274,13 +272,6 @@ def path_for_spec(self, spec):
|
|||||||
|
|
||||||
if spec.external:
|
if spec.external:
|
||||||
return spec.external_path
|
return spec.external_path
|
||||||
if self.check_upstream:
|
|
||||||
upstream, record = spack.store.STORE.db.query_by_spec_hash(spec.dag_hash())
|
|
||||||
if upstream:
|
|
||||||
raise SpackError(
|
|
||||||
"Internal error: attempted to call path_for_spec on"
|
|
||||||
" upstream-installed package."
|
|
||||||
)
|
|
||||||
|
|
||||||
path = self.relative_path_for_spec(spec)
|
path = self.relative_path_for_spec(spec)
|
||||||
assert not path.startswith(self.root)
|
assert not path.startswith(self.root)
|
||||||
|
Loading…
Reference in New Issue
Block a user