From e29ce70ca5761beb72e7a1c2d7d1f52927db2205 Mon Sep 17 00:00:00 2001
From: Darryl Green <darryl.green@arm.com>
Date: Tue, 5 Mar 2019 15:23:25 +0000
Subject: [PATCH] Reduce indentation levels

---
 scripts/abi_check.py | 52 +++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/scripts/abi_check.py b/scripts/abi_check.py
index 7e6d7fcfd..bab2fcdac 100755
--- a/scripts/abi_check.py
+++ b/scripts/abi_check.py
@@ -141,32 +141,34 @@ class AbiChecker(object):
         self.log.info(output.decode("utf-8"))
         if process.returncode != 0:
             raise Exception("git submodule update failed, aborting")
-        if (os.path.exists(os.path.join(git_worktree_path, "crypto"))
+        if not (os.path.exists(os.path.join(git_worktree_path, "crypto"))
                 and crypto_rev):
-            if crypto_repo:
-                shutil.rmtree(os.path.join(git_worktree_path, "crypto"))
-                clone_process = subprocess.Popen(
-                    [self.git_command, "clone", crypto_repo,
-                     "--branch", crypto_rev, "crypto"],
-                    cwd=git_worktree_path,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT
-                )
-                clone_output, _ = clone_process.communicate()
-                self.log.info(clone_output.decode("utf-8"))
-                if clone_process.returncode != 0:
-                    raise Exception("git clone failed, aborting")
-            else:
-                checkout_process = subprocess.Popen(
-                    [self.git_command, "checkout", crypto_rev],
-                    cwd=os.path.join(git_worktree_path, "crypto"),
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT
-                )
-                checkout_output, _ = checkout_process.communicate()
-                self.log.info(checkout_output.decode("utf-8"))
-                if checkout_process.returncode != 0:
-                    raise Exception("git checkout failed, aborting")
+            return
+
+        if crypto_repo:
+            shutil.rmtree(os.path.join(git_worktree_path, "crypto"))
+            clone_process = subprocess.Popen(
+                [self.git_command, "clone", crypto_repo,
+                 "--branch", crypto_rev, "crypto"],
+                cwd=git_worktree_path,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT
+            )
+            clone_output, _ = clone_process.communicate()
+            self.log.info(clone_output.decode("utf-8"))
+            if clone_process.returncode != 0:
+                raise Exception("git clone failed, aborting")
+        else:
+            checkout_process = subprocess.Popen(
+                [self.git_command, "checkout", crypto_rev],
+                cwd=os.path.join(git_worktree_path, "crypto"),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT
+            )
+            checkout_output, _ = checkout_process.communicate()
+            self.log.info(checkout_output.decode("utf-8"))
+            if checkout_process.returncode != 0:
+                raise Exception("git checkout failed, aborting")
 
     def build_shared_libraries(self, git_worktree_path, version):
         """Build the shared libraries in the specified worktree."""