Add new step for creating recovery file

Creating recovery file was moved from StepConfigure
to new step: StepCreateRecoveryFile

Submit together:
- https://review.tizen.org/gerrit/#/c/154907/
- https://review.tizen.org/gerrit/#/c/154906/

Change-Id: Iab03c201c6978d6b2e1ad6a639e0be5de221de5c
Signed-off-by: Damian Pietruchowski <d.pietruchow@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 3a8f779..5ec69e9 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -62,6 +62,7 @@
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
 #include <common/step/recovery/step_open_recovery_file.h>
+#include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -114,6 +115,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
 
 void HybridInstaller::InstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
@@ -167,6 +169,7 @@ void HybridInstaller::InstallSteps() {
 
 void HybridInstaller::UpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
@@ -258,6 +261,7 @@ void HybridInstaller::ReinstallSteps() {
 
 void HybridInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
@@ -338,6 +342,7 @@ void HybridInstaller::RecoverySteps() {
 
 void HybridInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::mount::StepMountUnpacked>();
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
@@ -391,6 +396,7 @@ void HybridInstaller::MountInstallSteps() {
 
 void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::mount::StepMountUnpacked>();
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 804a8e4..d6a3b55 100755 (executable)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -70,6 +70,7 @@
 #include <common/step/rds/step_rds_modify.h>
 #include <common/step/rds/step_rds_parse.h>
 #include <common/step/recovery/step_open_recovery_file.h>
+#include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_old_certificate.h>
 #include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_privacy_privilege.h>
@@ -122,6 +123,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
 
 void WgtInstaller::InstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
@@ -168,6 +170,7 @@ void WgtInstaller::InstallSteps() {
 
 void WgtInstaller::UpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
@@ -277,6 +280,7 @@ void WgtInstaller::ReinstallSteps() {
 
 void WgtInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::filesystem::StepUnzip>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, false);
@@ -353,6 +357,7 @@ void WgtInstaller::RecoverySteps() {
 
 void WgtInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::mount::StepMountUnpacked>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);
@@ -398,6 +403,7 @@ void WgtInstaller::MountInstallSteps() {
 
 void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+  AddStep<ci::configuration::StepCreateRecoveryFile>();
   AddStep<ci::mount::StepMountUnpacked>();
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::PACKAGE, true);