Fixing rollback

This patch should fix:
 1) Situation when backup files are not fully restored when
    file that has been backed up wasn't removed yet -> file
    is not restored (new flag: FS_MERGE_OVERWRITE)
 2) Situation when backup file was not fully copied and we
    restore broken copy (new flag: FS_COMMIT_COPY_FILE)

Submit together:
 - https://review.tizen.org/gerrit/88235
 - https://review.tizen.org/gerrit/88236

Change-Id: I49baa0c194b6247d33f40cc804610eb32aafe490

diff --git a/src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc
index fbb8519..b14c333 100644 (file)
--- a/src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc
+++ b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc
@@ -58,7 +58,7 @@ bool StepWgtPatchStorageDirectories::ShareDirFor3x() {
   }
   bf::path dst = context_->pkg_path.get() / kSharedResLocation;
   if (!common_installer::MoveDir(src, dst,
-                                 common_installer::FS_MERGE_DIRECTORIES)) {
+                                 common_installer::FS_MERGE_SKIP)) {
     LOG(ERROR) << "Failed to move shared data from res/wgt to shared";
     return false;
   }