Fix installer behavior

- Add routine which remove unnecessary file
- Change install location to internal when initialization
of external storage has failed, instead of install fail

Change-Id: Id4ae2ad3b06334770354fe991ab3531b451cd04f
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/common/step/backup/step_copy_backup.cc b/src/common/step/backup/step_copy_backup.cc
index 7c1c606..58eaa1c 100644 (file)
--- a/src/common/step/backup/step_copy_backup.cc
+++ b/src/common/step/backup/step_copy_backup.cc
@@ -54,6 +54,8 @@ Step::Status StepCopyBackup::process() {
   if (!NewContent())
     return Status::APP_DIR_ERROR;
 
+  RemoveContent();
+
   return Status::OK;
 }
 
@@ -159,6 +161,17 @@ bool StepCopyBackup::MoveMountPointContent(const boost::filesystem::path& from,
   return true;
 }
 
+void StepCopyBackup::RemoveContent() {
+  if (context_->request_type.get() == RequestType::Update &&
+    !context_->external_storage && bf::exists(install_path_ / ".mmc")) {
+    LOG(WARNING) << "Remove unnecessary files for external storage";
+    bs::error_code error;
+    bf::remove((install_path_ / ".mmc"), error);
+    if (error)
+      LOG(WARNING) << "error while remove files";
+  }
+}
+
 bool StepCopyBackup::NewContent() {
   bs::error_code error;
   bf::create_directories(install_path_.parent_path(), error);

diff --git a/src/common/step/backup/step_copy_backup.h b/src/common/step/backup/step_copy_backup.h
index a4ed590..6a637ee 100644 (file)
--- a/src/common/step/backup/step_copy_backup.h
+++ b/src/common/step/backup/step_copy_backup.h
@@ -55,6 +55,7 @@ class StepCopyBackup : public Step {
  private:
   bool Backup();
   bool NewContent();
+  void RemoveContent();
   bool CleanBackupDirectory();
   bool RollbackApplicationDirectory();
   bool MoveMountPointContent(const boost::filesystem::path& from,

diff --git a/src/common/step/filesystem/step_acquire_external_storage.cc b/src/common/step/filesystem/step_acquire_external_storage.cc
index a90f7f6..659d568 100644 (file)
--- a/src/common/step/filesystem/step_acquire_external_storage.cc
+++ b/src/common/step/filesystem/step_acquire_external_storage.cc
@@ -88,7 +88,7 @@ Step::Status StepAcquireExternalStorage::process() {
       storage = Storage::INTERNAL;
     } else {
       LOG(ERROR) << "Cannot initialize external storage for updated package";
-      return Status::APP_DIR_ERROR;
+      storage = Storage::INTERNAL;
     }
   }