diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-04-02 05:08:14 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-02 05:08:14 +0200 |
| commit | 705a4d72c87fa0da3dfc7c9413810523b8382b0b (patch) | |
| tree | eb0adaa80148da6be6f8de46200adba834f46adb | |
| parent | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e (diff) | |
| parent | Merge "Use regular check for partition name instead of CHECK()" (diff) | |
| download | android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar.gz android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar.bz2 android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar.lz android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar.xz android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.tar.zst android_bootable_recovery-705a4d72c87fa0da3dfc7c9413810523b8382b0b.zip | |
| -rw-r--r-- | update_verifier/update_verifier.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index 72b6dccc5..59f136c90 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -74,9 +74,10 @@ static int dm_name_filter(const dirent* de) { } 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 |