From 1b55057f367c90aa38793392875d009e0c5304d9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 24 Mar 2022 18:59:03 +0100 Subject: [PATCH] add_files_to_view: flip incorrect default (#29700) --- lib/spack/spack/build_systems/python.py | 2 +- lib/spack/spack/filesystem_view.py | 2 +- lib/spack/spack/package.py | 2 +- var/spack/repos/builtin/packages/python/package.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index d7e00d84b56..fd836afe922 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -216,7 +216,7 @@ def view_file_conflicts(self, view, merge_map): return conflicts - def add_files_to_view(self, view, merge_map, skip_if_exists=False): + def add_files_to_view(self, view, merge_map, skip_if_exists=True): bin_dir = self.spec.prefix.bin python_prefix = self.extendee_spec.prefix python_is_external = self.extendee_spec.external diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index 7c14e3d0443..1a4a492d2fb 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -810,7 +810,7 @@ def skip_list(file): full_src = os.path.join(src_root, src_rel) full_dst = os.path.join(self._root, dst_rel) merge_map[full_src] = full_dst - spec.package.add_files_to_view(self, merge_map, skip_if_exists=True) + spec.package.add_files_to_view(self, merge_map, skip_if_exists=False) # Finally create the metadata dirs. self.link_metadata(specs) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 46683cc60b1..4973a04ee26 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -479,7 +479,7 @@ def view_file_conflicts(self, view, merge_map): """ return set(dst for dst in merge_map.values() if os.path.lexists(dst)) - def add_files_to_view(self, view, merge_map, skip_if_exists=False): + def add_files_to_view(self, view, merge_map, skip_if_exists=True): """Given a map of package files to destination paths in the view, add the files to the view. By default this adds all files. Alternative implementations may skip some files, for example if other packages diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 7f968982874..7231e9e48b3 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1365,7 +1365,7 @@ def deactivate(self, ext_pkg, view, **args): self.spec )) - def add_files_to_view(self, view, merge_map, skip_if_exists=False): + def add_files_to_view(self, view, merge_map, skip_if_exists=True): bin_dir = self.spec.prefix.bin if sys.platform != 'win32'\ else self.spec.prefix for src, dst in merge_map.items():