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

Commit d32f5df7 authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge "libsnapshot: Propagate merge phase across merge failures."

parents edefadd2 c2bb3ee6

fs_mgr/libsnapshot/snapshot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,7 @@ bool SnapshotManager::WriteUpdateState(LockedFile* lock, UpdateState state, 
        SnapshotUpdateStatus old_status = ReadSnapshotUpdateStatus(lock);

        status.set_compression_enabled(old_status.compression_enabled());

        status.set_source_build_fingerprint(old_status.source_build_fingerprint());

        status.set_merge_phase(old_status.merge_phase());

    }

    return WriteSnapshotUpdateStatus(lock, status);

}