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

Fix bug in directory layout hidden files()

Browse Source
This commit is contained in:
Todd Gamblin 2015-05-10 17:56:27 -07:00
parent 5d2ee893c4
commit 43e5465592
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ def __init__(self, root, **kwargs):
@property
def hidden_file_paths(self):
return (self.metadata_dir)
return (self.metadata_dir,)
def relative_path_for_spec(self, spec):

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

@ -984,8 +984,10 @@ def do_activate(self, **kwargs):
self._sanity_check_extension()
force = kwargs.get('force', False)
spack.install_layout.check_extension_conflict(self.extendee_spec, self.spec)
spack.install_layout.check_extension_conflict(
self.extendee_spec, self.spec)
# Activate any package dependencies that are also extensions.
if not force:
for spec in self.spec.traverse(root=False):
if spec.package.extends(self.extendee_spec):
@ -1016,6 +1018,7 @@ def ignore(filename):
conflict = tree.find_conflict(self.prefix, ignore=ignore)
if conflict:
raise ExtensionConflictError(conflict)
tree.merge(self.prefix, ignore=ignore)

4
var/spack/packages/python/package.py
View File

@ -139,7 +139,9 @@ def write_easy_install_pth(self, exts):
def activate(self, ext_pkg, **args):
args.update(ignore=self.python_ignore(ext_pkg, args))
ignore=self.python_ignore(ext_pkg, args)
args.update(ignore=ignore)
super(Python, self).activate(ext_pkg, **args)
exts = spack.install_layout.extension_map(self.spec)