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

add_files_to_view: flip incorrect default (#29700)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-03-24 18:59:03 +01:00 committed by GitHub
parent f8224f284c
commit 1b55057f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/build_systems/python.py
View File

@ -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

2
lib/spack/spack/filesystem_view.py
View File

@ -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)

2
lib/spack/spack/package.py
View File

@ -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

2
var/spack/repos/builtin/packages/python/package.py
View File

@ -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():