diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-10 17:56:27 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-10 17:56:27 -0700 |
| commit | 43e546559285621e439d30df974fe9b8d49c5381 (patch) | |
| tree | 7bcaa8c2dd136071f2767bb7d34cd88796d21242 /lib | |
| parent | 5d2ee893c406ae5695659507d909df781c41e86f (diff) | |
| download | spack-43e546559285621e439d30df974fe9b8d49c5381.tar.gz spack-43e546559285621e439d30df974fe9b8d49c5381.tar.bz2 spack-43e546559285621e439d30df974fe9b8d49c5381.tar.xz spack-43e546559285621e439d30df974fe9b8d49c5381.zip | |
Fix bug in directory layout hidden files()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/directory_layout.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index c2e2ea4deb..fe02fff3b0 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -182,7 +182,7 @@ class YamlDirectoryLayout(DirectoryLayout): @property def hidden_file_paths(self): - return (self.metadata_dir) + return (self.metadata_dir,) def relative_path_for_spec(self, spec): diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index b0bb1fb7bc..9ddd55f5c0 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -984,8 +984,10 @@ class Package(object): 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 @@ class Package(object): conflict = tree.find_conflict(self.prefix, ignore=ignore) if conflict: raise ExtensionConflictError(conflict) + tree.merge(self.prefix, ignore=ignore) |