zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix/config caching 13754 (#13759)

Browse Source 
* remove reference to `spack.store` in method definition

Referencing `spack.store` in method definition will cache the `spack.config.config` singleton variable too early, before we have a chance to add command line and environment scopes.
This commit is contained in:
Greg Becker 2019-11-15 13:55:51 -08:00 committed by GitHub
parent 46bfcbbd3d
commit aa83c483f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/relocate.py
View File

@ -637,8 +637,7 @@ def is_relocatable(spec):
return True return True
def file_is_relocatable( def file_is_relocatable(file, paths_to_relocate=None):
file, paths_to_relocate=[spack.store.layout.root, spack.paths.prefix]):
"""Returns True if the file passed as argument is relocatable. """Returns True if the file passed as argument is relocatable.
Args: Args:
@ -651,6 +650,8 @@ def file_is_relocatable(
ValueError: if the file does not exist or the path is not absolute ValueError: if the file does not exist or the path is not absolute
""" """
default_paths_to_relocate = [spack.store.layout.root, spack.paths.prefix]
paths_to_relocate = paths_to_relocate or default_paths_to_relocate
if not (platform.system().lower() == 'darwin' if not (platform.system().lower() == 'darwin'
or platform.system().lower() == 'linux'): or platform.system().lower() == 'linux'):