diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-03-24 18:59:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 11:59:03 -0600 |
| commit | 1b55057f367c90aa38793392875d009e0c5304d9 (patch) | |
| tree | 8e17b02a35e49a12c5b3c758958542a341c9a860 | |
| parent | f8224f284cb4f9c4470bce29925e94c06d3c04b9 (diff) | |
| download | spack-1b55057f367c90aa38793392875d009e0c5304d9.tar.gz spack-1b55057f367c90aa38793392875d009e0c5304d9.tar.bz2 spack-1b55057f367c90aa38793392875d009e0c5304d9.tar.xz spack-1b55057f367c90aa38793392875d009e0c5304d9.zip | |
add_files_to_view: flip incorrect default (#29700)
| -rw-r--r-- | lib/spack/spack/build_systems/python.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/filesystem_view.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 2 | ||||
| -rw-r--r-- | 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 d7e00d84b5..fd836afe92 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -216,7 +216,7 @@ class PythonPackage(PackageBase): 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 7c14e3d044..1a4a492d2f 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -810,7 +810,7 @@ class SimpleFilesystemView(FilesystemView): 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 46683cc60b..4973a04ee2 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -479,7 +479,7 @@ class PackageViewMixin(object): """ 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 7f96898287..7231e9e48b 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1365,7 +1365,7 @@ config.update(get_paths()) 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(): |