Remove manifest backup when update recover with cleanup

In case update, installer create backup xml file
This backup file should be removed when run recovery with cleanup flag

Change-Id: If517d33729d83c2a7625621c0db17ec52a8fbebb
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/common/step/filesystem/step_recover_manifest.cc b/src/common/step/filesystem/step_recover_manifest.cc
index 27244d9..e2cb064 100644 (file)
--- a/src/common/step/filesystem/step_recover_manifest.cc
+++ b/src/common/step/filesystem/step_recover_manifest.cc
@@ -44,6 +44,21 @@ Step::Status StepRecoverManifest::RecoveryUpdate() {
   return Status::OK;
 }
 
+Step::Status StepRecoverManifest::Cleanup() {
+  if (!SetXmlPaths()) {
+    LOG(DEBUG) << "Manifest recovery not needed";
+    return Status::OK;
+  }
+  if (bf::exists(context_->backup_xml_path.get())) {
+    if (!Remove(context_->backup_xml_path.get())) {
+      LOG(ERROR) << "Cannot remove backup manifest file";
+      return Status::RECOVERY_ERROR;
+    }
+  }
+  LOG(INFO) << "Manifest recovery done";
+  return Status::OK;
+}
+
 bool StepRecoverManifest::SetXmlPaths() {
   if (context_->pkgid.get().empty())
     return false;

diff --git a/src/common/step/filesystem/step_recover_manifest.h b/src/common/step/filesystem/step_recover_manifest.h
index d53eda4..9fab414 100644 (file)
--- a/src/common/step/filesystem/step_recover_manifest.h
+++ b/src/common/step/filesystem/step_recover_manifest.h
@@ -27,6 +27,7 @@ class StepRecoverManifest : public recovery::StepRecovery {
 
   Status RecoveryNew() override;
   Status RecoveryUpdate() override;
+  Status Cleanup() override;
 
  private:
   bool SetXmlPaths();