Pass result of RunAndCaptureStdout from cvd display commands

jmacnak · jmacnak · commit 78cc4aceefc0 · 2025-08-04T13:41:53.000-07:00
Small fix for 57a27ae .
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/crosvm_display_controller.cpp b/base/cvd/cuttlefish/host/libs/vm_manager/crosvm_display_controller.cpp
@@ -107,11 +107,11 @@ Result<int> CrosvmDisplayController::RunCrosvmDisplayCommand(
 
   Result<std::string> res = RunAndCaptureStdout(std::move(command));
   if (res.ok()) {
+    *stdout_str = CF_EXPECT(std::move(res));
     return 0;
   } else {
     LOG(ERROR) << "Failed to run crosvm display command:\n"
                << res.error().FormatForEnv();
-    CF_EXPECT(std::move(res));
     return 0;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ Result<int> CrosvmDisplayController::RunCrosvmDisplayCommand(`
`107`	`107`
`108`	`108`	`Result<std::string> res = RunAndCaptureStdout(std::move(command));`
`109`	`109`	`if (res.ok()) {`
	`110`	`+ *stdout_str = CF_EXPECT(std::move(res));`
`110`	`111`	`return 0;`
`111`	`112`	`} else {`
`112`	`113`	`LOG(ERROR) << "Failed to run crosvm display command:\n"`
`113`	`114`	`<< res.error().FormatForEnv();`
`114`		`- CF_EXPECT(std::move(res));`
`115`	`115`	`return 0;`
`116`	`116`	`}`
`117`	`117`	`}`