match .spack literal, not as a regex (#26374)
This commit is contained in:
parent
727dcef2f4
commit
1aa7758dbb
@ -6,6 +6,7 @@
|
||||
import errno
|
||||
import glob
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import tempfile
|
||||
from contextlib import contextmanager
|
||||
@ -88,8 +89,8 @@ def __init__(self, root, **kwargs):
|
||||
self.manifest_file_name = 'install_manifest.json'
|
||||
|
||||
@property
|
||||
def hidden_file_paths(self):
|
||||
return (self.metadata_dir,)
|
||||
def hidden_file_regexes(self):
|
||||
return (re.escape(self.metadata_dir),)
|
||||
|
||||
def relative_path_for_spec(self, spec):
|
||||
_check_concrete(spec)
|
||||
|
@ -406,7 +406,7 @@ def merge(self, spec, ignore=None):
|
||||
|
||||
ignore = ignore or (lambda f: False)
|
||||
ignore_file = match_predicate(
|
||||
self.layout.hidden_file_paths, ignore)
|
||||
self.layout.hidden_file_regexes, ignore)
|
||||
|
||||
# check for dir conflicts
|
||||
conflicts = tree.find_dir_conflicts(view_dst, ignore_file)
|
||||
@ -432,7 +432,7 @@ def unmerge(self, spec, ignore=None):
|
||||
|
||||
ignore = ignore or (lambda f: False)
|
||||
ignore_file = match_predicate(
|
||||
self.layout.hidden_file_paths, ignore)
|
||||
self.layout.hidden_file_regexes, ignore)
|
||||
|
||||
merge_map = tree.get_file_map(view_dst, ignore_file)
|
||||
pkg.remove_files_from_view(self, merge_map)
|
||||
|
@ -1952,7 +1952,7 @@ def check_paths(path_list, filetype, predicate):
|
||||
|
||||
installed = set(os.listdir(self.prefix))
|
||||
installed.difference_update(
|
||||
spack.store.layout.hidden_file_paths)
|
||||
spack.store.layout.hidden_file_regexes)
|
||||
if not installed:
|
||||
raise InstallError(
|
||||
"Install failed for %s. Nothing was installed!" % self.name)
|
||||
|
Loading…
Reference in New Issue
Block a user