From 70c8bf44b8d2613c54423562f81e049fbb956780 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 26 Jan 2015 14:47:33 -0800
Subject: [PATCH] Fix for install sanity check -- don't count hidden dir layout
files.
---
lib/spack/spack/package.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 43b1fcd9c8..0b6bc4ce6c 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -836,10 +836,7 @@ def do_install(self, **kwargs):
self.install(self.spec, self.prefix)
# Ensure that something was actually installed.
- if not os.listdir(self.prefix):
- raise InstallError(
- "Install failed for %s. Nothing was installed!"
- % self.name)
+ self._sanity_check_install()
# On successful install, remove the stage.
if not keep_stage:
@@ -884,6 +881,15 @@ def do_install(self, **kwargs):
spack.hooks.post_install(self)
+
+ def _sanity_check_install(self):
+ installed = set(os.listdir(self.prefix))
+ installed.difference_update(spack.install_layout.hidden_file_paths)
+ if not installed:
+ raise InstallError(
+ "Install failed for %s. Nothing was installed!" % self.name)
+
+
def do_install_dependencies(self, **kwargs):
# Pass along paths of dependencies here
for dep in self.spec.dependencies.values():
--
GitLab