feat: compatible with runtime module

兼容旧版本的runtime module
deepin-community · Dec 2, 2024 · c3291bc · c3291bc
1 parent 1cf569e
commit c3291bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/libs/linglong/src/linglong/builder/linglong_builder.cpp b/libs/linglong/src/linglong/builder/linglong_builder.cpp
@@ -570,6 +570,10 @@ utils::error::Result<void> Builder::build(const QStringList &args) noexcept
                       2);
     auto baseLayerDir = this->repo.getMergedModuleDir(*baseRef, false);
     if (!baseLayerDir) {
+        baseLayerDir = this->repo.getLayerDir(*baseRef, "develop");
+        if (!baseLayerDir.has_value()) {
+            return LINGLONG_ERR("get base layer dir", baseLayerDir);
+        }
         return LINGLONG_ERR("get base layer dir", baseLayerDir);
     }
 
@@ -613,7 +617,10 @@ utils::error::Result<void> Builder::build(const QStringList &args) noexcept
                           2);
         auto runtimeLayerDirRet = this->repo.getMergedModuleDir(*runtimeRet, false);
         if (!runtimeLayerDirRet.has_value()) {
-            return LINGLONG_ERR("get runtime layer dir", runtimeLayerDirRet);
+            runtimeLayerDirRet = this->repo.getLayerDir(*runtimeRet, "develop");
+            if (!runtimeLayerDirRet.has_value()) {
+                return LINGLONG_ERR("get runtime layer dir", runtimeLayerDirRet);
+            }
         }
         runtimeRef = *runtimeRet;
         runtimeLayerDir = *runtimeLayerDirRet;

diff --git a/libs/linglong/src/linglong/repo/ostree_repo.cpp b/libs/linglong/src/linglong/repo/ostree_repo.cpp
@@ -2041,6 +2041,9 @@ utils::error::Result<void> OSTreeRepo::mergeModules() const noexcept
                 binaryCommit = layer.commit;
             }
         }
+        if (binaryCommit.empty()) {
+            continue;
+        }
         auto mergeID = hash.result().toHex().toStdString();
         // 判断单个merged是否有变动
         auto mergedChanged = true;