From 3dbafb5ee7f582b395cba3783ddba5cc579dbd16 Mon Sep 17 00:00:00 2001 From: Tim Fuller Date: Fri, 15 Nov 2019 14:32:58 -0700 Subject: Fix for issue #13754 (#13755) * 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. --- lib/spack/spack/relocate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 4cbe6d64c6..8b1f3422d2 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -651,8 +651,7 @@ def is_relocatable(spec): return True -def file_is_relocatable( - file, paths_to_relocate=[spack.store.layout.root, spack.paths.prefix]): +def file_is_relocatable(file, paths_to_relocate=None): """Returns True if the file passed as argument is relocatable. Args: @@ -665,6 +664,8 @@ def file_is_relocatable( 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' or platform.system().lower() == 'linux'): -- cgit v1.2.3-60-g2f50