From ca625dadda76259cec5543a2c4096e1d39fbc15f Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Tue, 15 May 2018 20:22:50 +0900
Subject: [PATCH] Supplement ParserPlugin

- Adjust order of steps.
- Add StepRecoverParserPlugin.

Related changes:
[app-installers] : https://review.tizen.org/gerrit/178962

Change-Id: I7bddab2ef30a9c6f4adc252bb41270f7559c2f86
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/tpk/tpk_installer.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index 427c2f1..d7f0aed 100644
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -60,6 +60,7 @@
 #include <common/step/pkgmgr/step_check_restriction.h>
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.h>
+#include <common/step/pkgmgr/step_recover_parser_plugins.h>
 #include <common/step/pkgmgr/step_register_app.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
@@ -221,8 +222,6 @@ void TpkInstaller::UninstallSteps() {
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
@@ -238,6 +237,8 @@ void TpkInstaller::UninstallSteps() {
   AddStep<ci::filesystem::StepRemoveIcons>();
   AddStep<ci::security::StepRevokeSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -358,6 +359,7 @@ void TpkInstaller::RecoverySteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
   AddStep<ci::filesystem::StepRecoverIcons>();
+  AddStep<ci::pkgmgr::StepRecoverParserPlugin>();
   AddStep<ci::filesystem::StepRecoverManifest>();
   AddStep<ci::filesystem::StepRecoverExternalStorage>();
   AddStep<ci::filesystem::StepRecoverStorageDirectories>();
@@ -656,7 +658,6 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<tpk::filesystem::StepRemoveExternalStorageDirectories>();
@@ -674,6 +675,7 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
 }
 
 void TpkInstaller::DisablePkgSteps() {
-- 
2.7.4