commit a645037933e741455d410c59adc84ad360c96ea9
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 23 21:30:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 23 21:30:31 2020 +0000
tree 6c80a3e37f19d470ade5d24a4c12af603e01db69
parent 94982089c77f012a33b11777979618e3d05dec84
parent 942dbe9f45e9ea8ef6e9cb11fd3a55946258b305

Merge "When encountered an unexpected status, mention it"

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 912087c..fbeb08f 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -828,7 +828,8 @@
                 cancelled = true;
                 break;
             default:
-                LOG(ERROR) << "Unknown merge status: " << static_cast<uint32_t>(snapshot_state);
+                LOG(ERROR) << "Unknown merge status for \"" << snapshot << "\": "
+                           << "\"" << snapshot_state << "\"";
                 failed = true;
                 break;
         }
@@ -1706,7 +1707,7 @@
     } else if (contents == "merge-failed") {
         return UpdateState::MergeFailed;
     } else {
-        LOG(ERROR) << "Unknown merge state in update state file";
+        LOG(ERROR) << "Unknown merge state in update state file: \"" << contents << "\"";
         return UpdateState::None;
     }
 }
@@ -1728,7 +1729,7 @@
         case UpdateState::MergeFailed:
             return os << "merge-failed";
         default:
-            LOG(ERROR) << "Unknown update state";
+            LOG(ERROR) << "Unknown update state: " << static_cast<uint32_t>(state);
             return os;
     }
 }