commit d32f5df728c3a1c88b9deb4554ff6386104846fc
author David Anderson <dvander@google.com> Mon Jul 19 21:01:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 19 21:01:06 2021 +0000
tree 8d79b197756f31d088d3b4d98e9ceb68bbf562e1
parent edefadd24202e38343249aba97cd2d95e68adaf5
parent c2bb3ee6d67ebe4853845004cc0fa8b2dec38bba

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

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index bed5f56..c3db32e 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -2530,6 +2530,7 @@
         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);
 }