commit cd66e52573cda80b8699266efbc60484886f040a
author Tianjie Xu <xunchang@google.com> Sun Apr 02 03:05:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Apr 02 03:05:45 2017 +0000
tree eb0adaa80148da6be6f8de46200adba834f46adb
parent 89559e3cfeb5bb54a09b1fe390eb417b7a379091
parent 76cb4eeda6fd7db5aadd74762fcdd05e3a860e45

Merge "Use regular check for partition name instead of CHECK()"
am: 76cb4eeda6

Change-Id: Idd4686a7d30f08baa92557a0bcc872e95f867ba3

update_verifier/update_verifier.cpp

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