Change order of StepRecoverApplication

At this moment, in some situation StepRecoverSecurity needs
data from pkgmgr database, so unregister application
step should be done after StepRecoverSecurity.

Change-Id: I06558231cd65cdd214eb930937f344c0b2827e4c

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index f1dd5c4..a6a832f 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -301,9 +301,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::filesystem::StepRecoverFiles>();
       AddStep<ci::mount::StepMountRecover>();
       AddStep<tpk::security::StepTpkRecoverSignature>();
-      AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRecoverChangeOwner>();
       AddStep<ci::security::StepRecoverSecurity>();
+      AddStep<ci::pkgmgr::StepRecoverApplication>();
       break;
     case ci::RequestType::MountInstall:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 1eacc18..31565f7 100755 (executable)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -393,9 +393,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepRecoverFiles>();
       AddStep<ci::mount::StepMountRecover>();
       AddStep<wgt::security::StepWgtRecoverSignature>();
-      AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRecoverChangeOwner>();
       AddStep<ci::security::StepRecoverSecurity>();
+      AddStep<ci::pkgmgr::StepRecoverApplication>();
   }
 
   void WgtInstaller::MountInstallSteps() {