summaryrefslogtreecommitdiffstats
path: root/applypatch/applypatch.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-10-19 02:42:01 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-10-19 02:42:01 +0200
commitece0b68ca6e9e8b45898e9f46e63666058e8c383 (patch)
tree71cca3b39191f7ff0d9153fa4efbd45d184d1891 /applypatch/applypatch.cpp
parentMerge "Fix bootloader_message." (diff)
parentMerge "Fix applypatch_check failure when applying update on angler" (diff)
downloadandroid_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar.gz
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar.bz2
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar.lz
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar.xz
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.tar.zst
android_bootable_recovery-ece0b68ca6e9e8b45898e9f46e63666058e8c383.zip
Diffstat (limited to 'applypatch/applypatch.cpp')
-rw-r--r--applypatch/applypatch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index cf155607b..48e4c8386 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -430,7 +430,7 @@ int applypatch_check(const char* filename, const std::vector<std::string>& patch
// partitions, where the filename encodes the sha1s; no need to
// check them twice.)
if (LoadFileContents(filename, &file) != 0 ||
- FindMatchingPatch(file.sha1, patch_sha1_str) < 0) {
+ (patch_sha1_str.size() > 0 && FindMatchingPatch(file.sha1, patch_sha1_str) < 0)) {
printf("file \"%s\" doesn't have any of expected "
"sha1 sums; checking cache\n", filename);