Skip to content

Fix invalid optional access in GetHostBuild #2241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Mar 10, 2026
Merged

Fix invalid optional access in GetHostBuild #2241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,17 @@ Result<void> UpdateTargetsWithBuilds(BuildApi& build_api,
Result<Build> GetHostBuild(BuildApi& build_api,
const HostToolsTarget& host_target,
const std::optional<Build>& fallback_host_build) {
auto host_package_build = CF_EXPECT(
std::optional<Build> host_package_build = CF_EXPECT(
GetBuildHelper(build_api, host_target.build_string, kDefaultBuildTarget));
CF_EXPECT(host_package_build.has_value() || fallback_host_build.has_value(),
"Either `--host_package_build` or `--default_build` needs to be "
"specified. Try "
"`--default_build=aosp-android-latest-release/"
"aosp_cf_x86_64_only_phone-userdebug");
return host_package_build.value_or(*fallback_host_build);
if (host_package_build.has_value()) {
return host_package_build.value();
} else if (fallback_host_build.has_value()) {
return fallback_host_build.value();
}
return CF_ERR(
"Either `--host_package_build` or `--default_build` needs to be "
"specified. Try `--default_build=aosp-android-latest-release/"
"aosp_cf_x86_64_only_phone-userdebug");
}

Result<std::string> SaveConfig(FetcherConfig& config,
Expand Down
Loading