commit db33eeeacca82c68bd2df9321702d27b10c1fe1e
author Tianjie Xu <xunchang@google.com> Tue Jul 03 13:41:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 03 13:41:22 2018 -0700
tree e5a1e6a36c0ee4a51a6743e90269101b0db0b432
parent 33cfd108ca418fd06861d740a2ffd7de3e9e4795
parent 65419746cba439b17d0d162b00777b4462aa46b1

Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b
am: 65419746cb

Change-Id: I179a877d89ffff210a87df26a589dd403d77ad4f

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index cdf24f8..937c5e1 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -765,7 +765,9 @@
       }
       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;