Adjust order of steps

Revert from '192eddd5a83d207a760c025c328e3096f8debdca'

Change-Id: I81c2d69752e2734d53b15bfe8bb851a9a5014b51
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 079754ff9da9f7aa933bf1df74ae7bdf77aa9ecb..d25264dbd6cb092bd85423247e937954b4f64da6 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -239,6 +239,8 @@ void HybridInstaller::UninstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
@@ -254,8 +256,6 @@ void HybridInstaller::UninstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
   AddStep<ci::security::StepRevokeSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 840bd81ff32d7768d4d15ad4b2bd7352be2795a8..2031f14b994539ecfafb3a7aa10c1a219c17fe1c 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -236,6 +236,8 @@ void WgtInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
   AddStep<ci::pkgmgr::StepUnregisterApplication>();
   AddStep<ci::filesystem::StepRemoveTep>();
@@ -248,8 +250,6 @@ void WgtInstaller::UninstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
   AddStep<ci::security::StepRevokeSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }