Merge branch 'binary_packages' of github.com:gartung/spack into binary_packages

gartung · gartung · commit e15a3f084e10 · 2016-11-16T15:02:07.000-06:00
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -1177,7 +1177,7 @@ def do_install(self,
 
         tty.msg("Installing %s" % self.name)
 
-        fetch_binary=kwargs.pop('fetch_binary', 'never')
+        fetch_binary = kwargs.pop('fetch_binary', 'never')
         # First, install dependencies recursively.
         if install_deps:
             for dep in self.spec.dependencies():
@@ -1212,7 +1212,7 @@ def do_install(self,
             else:
                 tty.warn("No binary package for %s found."
                          % self.name)
-	# Set parallelism before starting build.
+        # Set parallelism before starting build.
         self.make_jobs = make_jobs
 
         # Then install the package itself.
diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py
@@ -61,7 +61,7 @@ def modify_macho_object(path_name, old_dir, new_dir):
 
     the old install dir in LC_RPATH is replaced with the new install dir using
         install_name_tool  -rpath old new binary
-   
+       
     """
     command = which('otool')
     output  = command("-l", path_name, output=str, err=str)
@@ -195,7 +195,7 @@ def relocate_binary(path_name, old_dir, new_dir, patchelf_executable):
         orig_rpaths = get_existing_elf_rpaths(path_name, patchelf_executable)
         new_rpaths  = substitute_rpath(orig_rpaths, old_dir, new_dir)
         modify_elf_object(path_name, orig_rpaths, new_rpaths, 
-                         patchelf_executable)
+                          patchelf_executable)
     else:
         tty.die("Relocation not implemented for %s" % platform.system())
 
