Merge "Fix test flake"
This commit is contained in:
@@ -1424,9 +1424,10 @@ def ResolveAVBSigningPathArgs(split_args):
|
|||||||
def ResolveBinaryPath(path):
|
def ResolveBinaryPath(path):
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
return path
|
return path
|
||||||
new_path = os.path.join(OPTIONS.search_path, path)
|
if OPTIONS.search_path:
|
||||||
if os.path.exists(new_path):
|
new_path = os.path.join(OPTIONS.search_path, path)
|
||||||
return new_path
|
if os.path.exists(new_path):
|
||||||
|
return new_path
|
||||||
raise ExternalError(
|
raise ExternalError(
|
||||||
"Failed to find {}".format(new_path))
|
"Failed to find {}".format(new_path))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user