Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8
am: 2e797d9905
Change-Id: Ib81077e24225a972edbb9a90b86c376608e56cba
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index 72b6dcc..59f136c 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -74,9 +74,10 @@
}
static bool read_blocks(const std::string& partition, const std::string& range_str) {
- CHECK(partition == "system" || partition == "vendor")
- << "partition name should be system or vendor" << partition;
-
+ if (partition != "system" && partition != "vendor") {
+ LOG(ERROR) << "partition name must be system or vendor: " << partition;
+ return false;
+ }
// Iterate the content of "/sys/block/dm-X/dm/name". If it matches "system"
// (or "vendor"), then dm-X is a dm-wrapped system/vendor partition.
// Afterwards, update_verifier will read every block on the care_map_file of