commit 59f99b31ebd16ebe0f93587b7813481f26225156
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 28 01:18:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 28 01:18:55 2023 +0000
tree 2307d8b8f167c9c83c01b2543390310b2d462b25
parent ef530fdf9ad1c136f4527b9e9a9a1c2f0defc489
parent 97a5afe0f3a2ab6ee41176863452e00e66820f83

Merge "Fix test flake"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 4c390b4..091121f 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1424,9 +1424,10 @@
   def ResolveBinaryPath(path):
     if os.path.exists(path):
       return path
-    new_path = os.path.join(OPTIONS.search_path, path)
-    if os.path.exists(new_path):
-      return new_path
+    if OPTIONS.search_path:
+      new_path = os.path.join(OPTIONS.search_path, path)
+      if os.path.exists(new_path):
+        return new_path
     raise ExternalError(
         "Failed to find {}".format(new_path))