diff options
| author | Tianjie Xu <xunchang@google.com> | 2018-02-28 19:59:33 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 19:59:33 +0100 |
| commit | 7b9a92c1e2f59cdfbc051928edc8ec15b7833046 (patch) | |
| tree | f24ac44003f8381db9bb5d25f8daac0850266eb5 | |
| parent | Merge "Remove the assumption of target chunk size in imgdiff" (diff) | |
| parent | Merge "Fix the behavior of undefined commands in BlockImageVerify" (diff) | |
| download | android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar.gz android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar.bz2 android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar.lz android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar.xz android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.tar.zst android_bootable_recovery-7b9a92c1e2f59cdfbc051928edc8ec15b7833046.zip | |
| -rw-r--r-- | updater/blockimg.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index feb2aeb27..4f085b204 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1727,9 +1727,11 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, const Command* cmd = cmd_map[params.cmdname]; + // Skip the command if we explicitly set the corresponding function pointer to nullptr, e.g. + // "erase" during block_image_verify. if (cmd->f == nullptr) { - LOG(ERROR) << "failed to find the function for command [" << line << "]"; - goto pbiudone; + LOG(DEBUG) << "skip executing command [" << line << "]"; + continue; } // Skip all commands before the saved last command index when resuming an update. |