Snap for 4628106 from bb928df6eb to pi-release

Change-Id: I7c640dea7542f462d8bd820cc0f19d53c367035a
2018-03-01 08:24:32 +00:00
parent 4bda178fe4 bb928df6eb
commit 93015f75ba
1 changed files with 4 additions and 2 deletions
@@ -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.