From da9e849b58f3eece524a5e794f1a1e3b60a96fa5 Mon Sep 17 00:00:00 2001 From: ilho kim Date: Thu, 19 Jan 2023 13:42:20 +0900 Subject: [PATCH] Fix StepCopyBackup The operation of creating shared res directory should be performed in NewContent, not Backup Change-Id: Ie8eac77d94b9db6466fdfdb65f0e1be1a9aba763 Signed-off-by: ilho kim --- src/common/step/backup/step_copy_backup.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/step/backup/step_copy_backup.cc b/src/common/step/backup/step_copy_backup.cc index 82d98e4..09a2252 100644 --- a/src/common/step/backup/step_copy_backup.cc +++ b/src/common/step/backup/step_copy_backup.cc @@ -184,11 +184,6 @@ bool StepCopyBackup::Backup() { return false; } - if (ShouldBackupSharedRes()) { - if (!CreateSharedRes(backup_path_, context_->GetPkgPath())) - return false; - } - AddRecoveryInfo(); LOG(INFO) << "Old package context saved to: " << backup_path_; @@ -242,6 +237,11 @@ bool StepCopyBackup::NewContent() { return false; } + if (ShouldBackupSharedRes()) { + if (!CreateSharedRes(backup_path_, context_->GetPkgPath())) + return false; + } + for (bf::directory_iterator iter(context_->unpacked_dir_path.get()); iter != bf::directory_iterator(); ++iter) { if (!Move(iter->path(), install_path_, FS_MERGE_SKIP)) -- 2.7.4