Fix installing shared/data directory of ReadonlyUpdateInstall/Uninstall

Use StepUpdateStorageDirectory and adjust step order just like as Update
mode, because security registration of StepUpdateSecurity overrides
shared_ro flag.

Change-Id: I734a64b736ad915e801e8c803ed12291464edc72
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index 3994b7cbb436efb6f15abb58aff07311115dd637..4c3cd8bde16fae995582324397196e4e025ae5e2 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -614,7 +614,6 @@ void TpkInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::security::StepRevokeTrustAnchor>();
   AddStep<ci::filesystem::StepCopy>();
   AddStep<ci::filesystem::StepCopyTep>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<tpk::filesystem::StepCreateExternalStorageDirectories>();
   AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
@@ -627,6 +626,7 @@ void TpkInstaller::ReadonlyUpdateInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -663,6 +663,7 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::filesystem::StepRemoveUserData>();
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
   AddStep<ci::security::StepUpdateSecurity>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
 }