Modify order of StepConvertXml for manifestdirect steps

- Modify order of StepConvertXml to be performed after
  StepParsePreload to apply modification of manifest data
  into modified xml

Related changes:
[pkgmgr-tool] : https://review.tizen.org/gerrit/#/c/141034/

Change-Id: I7b556f559f5325141556b784abd269a2b444ca49
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
(cherry picked from commit 4d4d8693982faa00f6a25f5e15233bf1b3ad4fad)

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index a468ddc3e23bb23439e0eac20aa973f39ccd6e5f..cafaa86cec25e27ead4642c0f0e7a9b1d92a98e3 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -469,10 +469,10 @@ void TpkInstaller::ManifestDirectInstallSteps() {
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckInstallable>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<tpk::filesystem::StepCheckPkgDirPath>();
   AddStep<ci::configuration::StepParsePreload>();
+  AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
@@ -496,9 +496,9 @@ void TpkInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::configuration::StepParsePreload>();
+  AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();