From 3c5958f62dbecf5eca10c388e50a6caf4c5682a4 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Fri, 9 Mar 2018 14:10:25 -0800 Subject: [PATCH] No longer print hash for stashed blocks during verification of retry During block verification, load stash reads from the source blocks on the device instead of the stashed files. And for interrupted update, it's pretty common that the source blocks has already been overwritten by subsequent commands. In that case the hash printing is mostly useless. Moreover we should have already printed the hash when the first update failed. Bug: 80241799 Test: Unit tests pass. No longer prints mismatching stashed source blocks on retry. Change-Id: I4effe684280b0325199f6cc4b2cc26e91295c2d7 --- updater/blockimg.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index cdf24f8b..937c5e14 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -765,7 +765,9 @@ static int LoadStash(const CommandParameters& params, const std::string& id, boo } if (VerifyBlocks(id, *buffer, src.blocks(), true) != 0) { LOG(ERROR) << "failed to verify loaded source blocks in stash map."; - PrintHashForCorruptedStashedBlocks(id, *buffer, src); + if (!is_retry) { + PrintHashForCorruptedStashedBlocks(id, *buffer, src); + } return -1; } return 0;