Fix for install sanity check -- don't count hidden dir layout files.
This commit is contained in:
		@@ -836,10 +836,7 @@ def do_install(self, **kwargs):
 | 
				
			|||||||
                    self.install(self.spec, self.prefix)
 | 
					                    self.install(self.spec, self.prefix)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                # Ensure that something was actually installed.
 | 
					                # Ensure that something was actually installed.
 | 
				
			||||||
                if not os.listdir(self.prefix):
 | 
					                self._sanity_check_install()
 | 
				
			||||||
                    raise InstallError(
 | 
					 | 
				
			||||||
                        "Install failed for %s.  Nothing was installed!"
 | 
					 | 
				
			||||||
                        % self.name)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
                # On successful install, remove the stage.
 | 
					                # On successful install, remove the stage.
 | 
				
			||||||
                if not keep_stage:
 | 
					                if not keep_stage:
 | 
				
			||||||
@@ -884,6 +881,15 @@ def do_install(self, **kwargs):
 | 
				
			|||||||
        spack.hooks.post_install(self)
 | 
					        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):
 | 
					    def do_install_dependencies(self, **kwargs):
 | 
				
			||||||
        # Pass along paths of dependencies here
 | 
					        # Pass along paths of dependencies here
 | 
				
			||||||
        for dep in self.spec.dependencies.values():
 | 
					        for dep in self.spec.dependencies.values():
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user