Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962e3ddf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Missing UpdateState::Cancelled string conversions"

parents a911933a a60f6a35

fs_mgr/libsnapshot/snapshot.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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<uint32_t>(state);

            return os;