update_engine: increase logging on config detection failure
In the event the partition version cannot be detected we were logging it
as if it had been detected but defaulting back to a fallback value. We
should log the failure to find the config.
BUG=chromium:971174
TEST=run cros_generate_update_payload --image chromiumos_base_image.bin --src_image chromiumos_base_image.bin --output output
on a known bad image
Change-Id: I5389134e809217e5134bdfb8d16b32a43aeb3f9f
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 10ae2a0..ddb9a35 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -645,17 +645,25 @@
payload_config.version.minor = kInPlaceMinorPayloadVersion;
brillo::KeyValueStore store;
uint32_t minor_version;
+ bool minor_version_found = false;
for (const PartitionConfig& part : payload_config.source.partitions) {
if (part.fs_interface && part.fs_interface->LoadSettings(&store) &&
utils::GetMinorVersion(store, &minor_version)) {
payload_config.version.minor = minor_version;
+ minor_version_found = true;
+ LOG(INFO) << "Auto-detected minor_version="
+ << payload_config.version.minor;
break;
}
}
+ LOG_IF(WARNING, !minor_version_found)
+ << "Failed to detect minor version defaulting to minor_version="
+ << payload_config.version.minor;
} else {
payload_config.version.minor = kFullPayloadMinorVersion;
+ LOG(INFO) << "Using non-delta minor_version="
+ << payload_config.version.minor;
}
- LOG(INFO) << "Auto-detected minor_version=" << payload_config.version.minor;
} else {
payload_config.version.minor = FLAGS_minor_version;
LOG(INFO) << "Using provided minor_version=" << FLAGS_minor_version;