Reorder DeltaSteps 29/70529/2
authorPiotr Ganicz <p.ganicz@samsung.com>
Thu, 19 May 2016 09:20:50 +0000 (11:20 +0200)
committerTomasz Iwanek <t.iwanek@samsung.com>
Thu, 19 May 2016 11:35:12 +0000 (04:35 -0700)
This fix proviedes proper order of the steps in delta installer
and resolves the segmentation fault in DeltaMode_Tpk test.

Change-Id: I18290c0906e92798a6e1bbdb9843789fadf0db98

src/tpk/tpk_installer.cc

index 0952ad3..c7af87d 100644 (file)
@@ -235,14 +235,14 @@ void TpkInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
   AddStep<ci::filesystem::StepDeltaPatch>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
   AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
   AddStep<ci::configuration::StepBlockCrossUpdate>();
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::backup::StepBackupManifest>();