aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Chang <oliverchang@users.noreply.github.com>2021-01-20 16:52:49 +1100
committerGitHub <noreply@github.com>2021-01-20 16:52:49 +1100
commit6e41513dbb452c30830c7a2c520a0c0dda8cd1d0 (patch)
tree2f7492ac5ff6113af67c9e1a201f21a2449b99f0
parent433ddc2337bf58d1973231c1a644357bbd557257 (diff)
downloadoss-fuzz-6e41513dbb452c30830c7a2c520a0c0dda8cd1d0.tar.gz
build_specified_commit: Remove an exception. (#5009)
Return None rather than exceptioning out when a suitable base-builder cannot be found to allow more graceful error handling.
-rw-r--r--infra/build_specified_commit.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/infra/build_specified_commit.py b/infra/build_specified_commit.py
index 886496a9a..9f29e420e 100644
--- a/infra/build_specified_commit.py
+++ b/infra/build_specified_commit.py
@@ -59,7 +59,8 @@ class BaseBuilderRepo:
if index > 0:
return self.digests[index - 1]
- raise ValueError('Failed to find suitable base-builder.')
+ logging.error('Failed to find suitable base-builder.')
+ return None
def _replace_gitdir(src_dir, file_path):
@@ -269,6 +270,9 @@ def build_fuzzers_from_commit(commit,
# Also use the closest base-builder we can find.
if base_builder_repo:
base_builder_digest = base_builder_repo.find_digest(commit_date)
+ if not base_builder_digest:
+ return False
+
logging.info('Using base-builder with digest %s.', base_builder_digest)
_replace_base_builder_digest(dockerfile_path, base_builder_digest)