Reduce indentation levels
This commit is contained in:
parent
4cde8a0513
commit
e29ce70ca5
1 changed files with 27 additions and 25 deletions
|
@ -141,32 +141,34 @@ class AbiChecker(object):
|
||||||
self.log.info(output.decode("utf-8"))
|
self.log.info(output.decode("utf-8"))
|
||||||
if process.returncode != 0:
|
if process.returncode != 0:
|
||||||
raise Exception("git submodule update failed, aborting")
|
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):
|
and crypto_rev):
|
||||||
if crypto_repo:
|
return
|
||||||
shutil.rmtree(os.path.join(git_worktree_path, "crypto"))
|
|
||||||
clone_process = subprocess.Popen(
|
if crypto_repo:
|
||||||
[self.git_command, "clone", crypto_repo,
|
shutil.rmtree(os.path.join(git_worktree_path, "crypto"))
|
||||||
"--branch", crypto_rev, "crypto"],
|
clone_process = subprocess.Popen(
|
||||||
cwd=git_worktree_path,
|
[self.git_command, "clone", crypto_repo,
|
||||||
stdout=subprocess.PIPE,
|
"--branch", crypto_rev, "crypto"],
|
||||||
stderr=subprocess.STDOUT
|
cwd=git_worktree_path,
|
||||||
)
|
stdout=subprocess.PIPE,
|
||||||
clone_output, _ = clone_process.communicate()
|
stderr=subprocess.STDOUT
|
||||||
self.log.info(clone_output.decode("utf-8"))
|
)
|
||||||
if clone_process.returncode != 0:
|
clone_output, _ = clone_process.communicate()
|
||||||
raise Exception("git clone failed, aborting")
|
self.log.info(clone_output.decode("utf-8"))
|
||||||
else:
|
if clone_process.returncode != 0:
|
||||||
checkout_process = subprocess.Popen(
|
raise Exception("git clone failed, aborting")
|
||||||
[self.git_command, "checkout", crypto_rev],
|
else:
|
||||||
cwd=os.path.join(git_worktree_path, "crypto"),
|
checkout_process = subprocess.Popen(
|
||||||
stdout=subprocess.PIPE,
|
[self.git_command, "checkout", crypto_rev],
|
||||||
stderr=subprocess.STDOUT
|
cwd=os.path.join(git_worktree_path, "crypto"),
|
||||||
)
|
stdout=subprocess.PIPE,
|
||||||
checkout_output, _ = checkout_process.communicate()
|
stderr=subprocess.STDOUT
|
||||||
self.log.info(checkout_output.decode("utf-8"))
|
)
|
||||||
if checkout_process.returncode != 0:
|
checkout_output, _ = checkout_process.communicate()
|
||||||
raise Exception("git checkout failed, aborting")
|
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):
|
def build_shared_libraries(self, git_worktree_path, version):
|
||||||
"""Build the shared libraries in the specified worktree."""
|
"""Build the shared libraries in the specified worktree."""
|
||||||
|
|
Loading…
Reference in a new issue