Fix deinstallation rollback

Security must be deregistered before files removal as
in rollback operation files must be restored before
security in applied to them once again.

Change-Id: Iacd6bfdcd52e072fcd00a3d04b2f355ddd8ceb2d

diff --git a/src/tpk/task.cc b/src/tpk/task.cc
index 99f8ef9..3fb50f3 100644 (file)
--- a/src/tpk/task.cc
+++ b/src/tpk/task.cc
@@ -124,9 +124,9 @@ bool Task::Uninstall() {
   ai.AddStep<ci::parse::StepParse>();
   ai.AddStep<ci::backup::StepBackupManifest>();
   ai.AddStep<ci::pkgmgr::StepUnregisterApplication>();
+  ai.AddStep<ci::security::StepRevokeSecurity>();
   ai.AddStep<ci::filesystem::StepRemoveFiles>();
   ai.AddStep<ci::filesystem::StepRemoveIcons>();
-  ai.AddStep<ci::security::StepRevokeSecurity>();
 
   return ai.Run() == ci::AppInstaller::Result::OK;
 }

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 8894f30..e6d881c 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -96,9 +96,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::parse::StepParse>();
       AddStep<ci::backup::StepBackupManifest>();
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
+      AddStep<ci::security::StepRevokeSecurity>();
       AddStep<ci::filesystem::StepRemoveFiles>();
       AddStep<ci::filesystem::StepRemoveIcons>();
-      AddStep<ci::security::StepRevokeSecurity>();
       AddStep<wgt::encrypt::StepRemoveEncryptionData>();
       break;
     }