Remove old shared spack code
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
import spack.directory_layout
|
import spack.directory_layout
|
||||||
|
|
||||||
#: default installation root, relative to the Spack install path
|
#: default installation root, relative to the Spack install path
|
||||||
default_root = os.path.join(spack.paths.opt_path, 'spack')
|
default_root = os.path.join(spack.paths.user_config_path, 'opt/spack')
|
||||||
|
|
||||||
|
|
||||||
class Store(object):
|
class Store(object):
|
||||||
@@ -70,10 +70,7 @@ def reindex(self):
|
|||||||
|
|
||||||
def _store():
|
def _store():
|
||||||
"""Get the singleton store instance."""
|
"""Get the singleton store instance."""
|
||||||
if spack.config.get('config:shared'):
|
root = spack.config.get('config:install_tree', default_root)
|
||||||
root = os.path.join(os.environ["SPACK_PATH"], "opt/")
|
|
||||||
else:
|
|
||||||
root = spack.config.get('config:install_tree', default_root)
|
|
||||||
|
|
||||||
# Canonicalize Path for Root regardless of origin
|
# Canonicalize Path for Root regardless of origin
|
||||||
root = spack.util.path.canonicalize_path(root)
|
root = spack.util.path.canonicalize_path(root)
|
||||||
|
|||||||
Reference in New Issue
Block a user