Revert "Adjust order of steps"

This reverts commit 238c12d0efc7fb96dfcec1a326bef76d43b0391c.

Change-Id: Ia17f8b9569eaff1abc6243a50b5bcfe0d5a713cc

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index d9d7814e8838099f40558009061bae45150ecf6b..200e488b2e72afe83dcee5a6c599135810c21156 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -281,6 +281,8 @@ 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>();
@@ -296,8 +298,6 @@ 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>();
 }
 
@@ -709,6 +709,7 @@ 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>();
@@ -725,7 +726,6 @@ 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() {