Change recovery files priority

If there are a recovery file with backup, backup file is used for recovery

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

diff --git a/src/pkg_recovery/pkg_recovery.cc b/src/pkg_recovery/pkg_recovery.cc
index 18a3448a81ff71da0191649c44099696c8b86277..a2a187b5f4d7a9ade69e611cda8b7c9644a5b021 100644 (file)
--- a/src/pkg_recovery/pkg_recovery.cc
+++ b/src/pkg_recovery/pkg_recovery.cc
@@ -140,9 +140,8 @@ void PkgRecoveryService::SearchBackupFiles(uid_t uid) {
       if (std::regex_search(file, match, backup_regex)) {
         bf::path orig_file(iter->path().parent_path() / iter->path().stem());
         if (bf::exists(orig_file))
-          bf::remove(iter->path());
-        else
-          bf::rename(iter->path(), orig_file);
+          bf::remove(orig_file);
+        bf::rename(iter->path(), orig_file);
       }
     } catch (...) {
       LOG(WARNING) << "Exception occurred: "