commit 5ca85a05e30a61192bb9a2fd481a2f2c964d8318
author Yo Chiang <yochiang@google.com> Fri Aug 21 08:01:21 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 21 08:01:21 2020 +0000
tree aa684f76f05b8265d00c83eb4ecf81361a4bef62
parent 36a21704e0436b49e58675e0b12df136b0e37514
parent 93c78c243d38619522e5e7c7605e1104748f4a88

Merge "Improve ImageManager error message"

fs_mgr/libfiemap/image_manager.cpp

diff --git a/fs_mgr/libfiemap/image_manager.cpp b/fs_mgr/libfiemap/image_manager.cpp
index f32e0eb..93fc131 100644
--- a/fs_mgr/libfiemap/image_manager.cpp
+++ b/fs_mgr/libfiemap/image_manager.cpp
@@ -640,16 +640,22 @@
         return false;
     }
 
+    bool ok = true;
     for (const auto& partition : metadata->partitions) {
         auto name = GetPartitionName(partition);
         auto image_path = GetImageHeaderPath(name);
         auto fiemap = SplitFiemap::Open(image_path);
-        if (!fiemap || !fiemap->HasPinnedExtents()) {
-            LOG(ERROR) << "Image is missing or was moved: " << image_path;
-            return false;
+        if (fiemap == nullptr) {
+            LOG(ERROR) << "SplitFiemap::Open(\"" << image_path << "\") failed";
+            ok = false;
+            continue;
+        }
+        if (!fiemap->HasPinnedExtents()) {
+            LOG(ERROR) << "Image doesn't have pinned extents: " << image_path;
+            ok = false;
         }
     }
-    return true;
+    return ok;
 }
 
 bool ImageManager::DisableImage(const std::string& name) {