Modify order of StepConvertXml for manifestdirect steps 12/141412/5
authorJunghyun Yeon <jungh.yeon@samsung.com>
Mon, 31 Jul 2017 09:20:00 +0000 (18:20 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Fri, 4 Aug 2017 07:01:32 +0000 (07:01 +0000)
- 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>
src/tpk/tpk_installer.cc

index 006505a62371f597ab7e1d7defcf65a1825c71b8..edd017550198aec707e8fcf104827a99b36fef9c 100644 (file)
@@ -481,10 +481,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>();
@@ -509,9 +509,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>();