Report errors from FindFile

Databean · Databean · commit 8284e22ca7ea · 2026-03-14T01:37:09.000Z
There is only one caller, and it looks like it was prepared to handle errors already in the empty-string format. https://github.com/google/android-cuttlefish/blob/4478181bf5fab943de83e7efea3fe2ecd981253b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc#L437 Bug: b/491924689
diff --git a/base/cvd/cuttlefish/common/libs/utils/files.cpp b/base/cvd/cuttlefish/common/libs/utils/files.cpp
@@ -621,7 +621,10 @@ Result<std::string> FindFile(const std::string& path,
     }
     return {};
   };
-  return WalkDirectory(path, callback).ok() ? "" : ret;
+  CF_EXPECT(WalkDirectory(path, callback));
+  CF_EXPECTF(!ret.empty(), "No file matching '{}' found in '{}'", target_name,
+             path);
+  return ret;
 }
 
 // Recursively enumerate files in |dir|, and invoke the callback function with

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,10 @@ Result<std::string> FindFile(const std::string& path,`
`621`	`621`	`}`
`622`	`622`	`return {};`
`623`	`623`	`};`
`624`		`- return WalkDirectory(path, callback).ok() ? "" : ret;`
	`624`	`+ CF_EXPECT(WalkDirectory(path, callback));`
	`625`	`+ CF_EXPECTF(!ret.empty(), "No file matching '{}' found in '{}'", target_name,`
	`626`	`+ path);`
	`627`	`+ return ret;`
`625`	`628`	`}`
`626`	`629`
`627`	`630`	`// Recursively enumerate files in \|dir\|, and invoke the callback function with`