Add flag when Move directory in recover update 99/177899/1
authorJunghyun Yeon <jungh.yeon@samsung.com>
Fri, 4 May 2018 08:10:18 +0000 (17:10 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Fri, 4 May 2018 08:10:55 +0000 (17:10 +0900)
- Flag was missing while resolving conflicts.

Change-Id: I127f605075cc93d864691062c03d4d564ec851ca
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
src/common/step/filesystem/step_recover_files.cc

index 1a7bfde..293c17b 100644 (file)
@@ -50,7 +50,7 @@ Step::Status StepRecoverFiles::RecoveryUpdate() {
       recovery_file->set_backup_done(false);
       recovery_file->WriteAndCommitFileContent();
     }
-    (void) MoveDir(backup_path, context_->pkg_path.get());
+    (void) MoveDir(backup_path, context_->pkg_path.get(), FS_MERGE_OVERWRITE);
   }
   LOG(INFO) << "Package files recovery done";
   return Status::OK;