diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index 785882a8d..a6f07fc03 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp @@ -1709,6 +1709,8 @@ static UpdateState UpdateStateFromString(const std::string& contents) { return UpdateState::MergeNeedsReboot; } else if (contents == "merge-failed") { return UpdateState::MergeFailed; + } else if (contents == "cancelled") { + return UpdateState::Cancelled; } else { LOG(ERROR) << "Unknown merge state in update state file: \"" << contents << "\""; return UpdateState::None; @@ -1731,6 +1733,8 @@ std::ostream& operator<<(std::ostream& os, UpdateState state) { return os << "merge-needs-reboot"; case UpdateState::MergeFailed: return os << "merge-failed"; + case UpdateState::Cancelled: + return os << "cancelled"; default: LOG(ERROR) << "Unknown update state: " << static_cast(state); return os;