Perform StepRevokeSecurity after StepRemove

Revoking security configuration causes StepRemove to fail.
Application files are labeled with per-app Smack label.
Access to that label is part of security configuration which shouldn't
be revoked before files are uninstalled.

Change-Id: Ib41ca3b04324f307954c64fa93cdefaf9da0325b
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/src/tpk/task.cc b/src/tpk/task.cc
index d02545f..892c043 100644 (file)
--- a/src/tpk/task.cc
+++ b/src/tpk/task.cc
@@ -105,9 +105,9 @@ bool Task::Uninstall() {
 
   ai.AddStep<ci::parse::StepParse>();
   ai.AddStep<ci::signal::StepSignal>();
-  ai.AddStep<ci::revoke_security::StepRevokeSecurity>();
   ai.AddStep<ci::unregister::StepUnregister>();
   ai.AddStep<ci::remove::StepRemove>();
+  ai.AddStep<ci::revoke_security::StepRevokeSecurity>();
 
   return ai.Run();
 }

diff --git a/src/wgt/wgt_backend.cc b/src/wgt/wgt_backend.cc
index 1f45ab7..70b82e5 100644 (file)
--- a/src/wgt/wgt_backend.cc
+++ b/src/wgt/wgt_backend.cc
@@ -59,9 +59,9 @@ int main(int argc, char** argv) {
     case PKGMGR_REQ_UNINSTALL: {
       installer.AddStep<ci::parse::StepParse>();
       installer.AddStep<ci::signal::StepSignal>();
-      installer.AddStep<ci::revoke_security::StepRevokeSecurity>();
       installer.AddStep<ci::unregister::StepUnregister>();
       installer.AddStep<ci::remove::StepRemove>();
+      installer.AddStep<ci::revoke_security::StepRevokeSecurity>();
       break;
     }
     default: {