From 65a54d07d82473770a32cc48b62bdcdc03800f62 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <s89.jang@samsung.com>
Date: Fri, 23 Dec 2016 16:28:28 +0900
Subject: [PATCH] Adjust step order of hybrid installer

Step for creating symlink should be called after merging manifest.

Change-Id: Ifdf323c5c0424c59cdbc99a0526f771050d5120d
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index af34823..e537659 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -134,11 +134,11 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
       AddStep<ci::filesystem::StepCreateStorageDirectories>();
-      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
-      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepRegisterSecurity>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
@@ -184,12 +184,12 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
       AddStep<ci::filesystem::StepCopyStorageDirectories>();
-      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
-      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
@@ -265,12 +265,12 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
       AddStep<ci::filesystem::StepCopyStorageDirectories>();
-      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
-      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
@@ -327,11 +327,11 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
       AddStep<ci::filesystem::StepCreateStorageDirectories>();
-      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
-      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepRegisterSecurity>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
@@ -376,12 +376,12 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::filesystem::StepCreateIcons>();
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
-      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
-      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::pkgmgr::StepGenerateXml>();
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      AddStep<tpk::filesystem::StepCreateSymbolicLink>();
       AddStep<ci::pkgmgr::StepUpdateApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
-- 
2.7.4