autopep8

gartung · gartung · commit 0f7ca0946831 · 2019-01-08T22:10:05.000-06:00
diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py
@@ -18,6 +18,7 @@ class InstallRootStringException(spack.error.SpackError):
     """
     Raised when the relocated binary still has the install root string.
     """
+
     def __init__(self, file_path, root_path):
         super(InstallRootStringException, self).__init__(
             "\n %s \ncontains string\n %s \n"
@@ -301,15 +302,15 @@ def relocate_binary(path_names, old_dir, new_dir, allow_root):
     if platform.system() == 'Darwin':
         for path_name in path_names:
             (rpaths, deps, idpath) = macho_get_paths(path_name)
-            #one pass to replace placeholder
+            # one pass to replace placeholder
             (n_rpaths,
              n_deps,
              n_idpath) = macho_replace_paths(placeholder,
-                                               new_dir,
-                                               rpaths,
-                                               deps,
-                                               idpath)
-            #another pass to replace old_dir 
+                                             new_dir,
+                                             rpaths,
+                                             deps,
+                                             idpath)
+            # another pass to replace old_dir
             (new_rpaths,
              new_deps,
              new_idpath) = macho_replace_paths(old_dir,
@@ -322,24 +323,24 @@ def relocate_binary(path_names, old_dir, new_dir, allow_root):
                                 new_rpaths, new_deps, new_idpath)
             if (not allow_root and
                 old_dir != new_dir and
-                strings_contains_installroot(path_name, old_dir)):
-                    raise InstallRootStringException(path_name, old_dir)
+                    strings_contains_installroot(path_name, old_dir)):
+                raise InstallRootStringException(path_name, old_dir)
 
     elif platform.system() == 'Linux':
         for path_name in path_names:
             orig_rpaths = get_existing_elf_rpaths(path_name)
             if orig_rpaths:
-                #one pass to replace placeholder
+                # one pass to replace placeholder
                 n_rpaths = substitute_rpath(orig_rpaths,
-                                              placeholder, new_dir)
-                #one pass to replace old_dir 
+                                            placeholder, new_dir)
+                # one pass to replace old_dir
                 new_rpaths = substitute_rpath(n_rpaths,
                                               old_dir, new_dir)
                 modify_elf_object(path_name, new_rpaths)
                 if (not allow_root and
                     old_dir != new_dir and
-                    strings_contains_installroot(path_name, old_dir)):
-                        raise InstallRootStringException(path_name, old_dir)
+                        strings_contains_installroot(path_name, old_dir)):
+                    raise InstallRootStringException(path_name, old_dir)
     else:
         tty.die("Relocation not implemented for %s" % platform.system())
 
@@ -359,8 +360,8 @@ def make_binary_relative(cur_path_names, orig_path_names, old_dir, allow_root):
                                 rpaths, deps, idpath,
                                 new_rpaths, new_deps, new_idpath)
             if (not allow_root and
-                strings_contains_installroot(cur_path)):
-                    raise InstallRootStringException(cur_path)
+                    strings_contains_installroot(cur_path)):
+                raise InstallRootStringException(cur_path)
     elif platform.system() == 'Linux':
         for cur_path, orig_path in zip(cur_path_names, orig_path_names):
             orig_rpaths = get_existing_elf_rpaths(cur_path)
@@ -369,8 +370,8 @@ def make_binary_relative(cur_path_names, orig_path_names, old_dir, allow_root):
                                                  orig_rpaths)
                 modify_elf_object(cur_path, new_rpaths)
                 if (not allow_root and
-                    strings_contains_installroot(cur_path, old_dir)):
-                        raise InstallRootStringException(cur_path, old_dir)
+                        strings_contains_installroot(cur_path, old_dir)):
+                    raise InstallRootStringException(cur_path, old_dir)
     else:
         tty.die("Prelocation not implemented for %s" % platform.system())
 
