Fix codes for Manifest installation

[platform/core/appfw/wgt-backend.git] / src / hybrid / hybrid_installer.cc

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index d238400..01266aa 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -152,7 +152,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
@@ -210,7 +211,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();
@@ -302,7 +304,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepRegisterTrustAnchor>(
@@ -375,7 +378,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
@@ -432,7 +436,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();
@@ -472,7 +477,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::security::StepRegisterTrustAnchor>(
           ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
@@ -513,7 +519,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
       AddStep<ci::pkgmgr::StepUpdateApplication>();
       AddStep<ci::security::StepRegisterTrustAnchor>(
           ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
@@ -535,7 +542,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
       AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
       AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepSaveSignature>();
@@ -564,7 +572,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
       AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
       AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepSaveSignature>();
@@ -647,7 +656,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-      AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>(
+          hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();