From df2d27c9d8a4cb99d4135a40e6e5c773b54c6803 Mon Sep 17 00:00:00 2001 From: Zhou Shihui Date: Sat, 10 May 2025 16:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=95=B0=E6=8D=AE=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=88=86=E8=BA=ABbackup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zhou Shihui --- .../src/installd/installd_host_impl.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/services/bundlemgr/src/installd/installd_host_impl.cpp b/services/bundlemgr/src/installd/installd_host_impl.cpp index f59b0fa03a..64074ebbd7 100644 --- a/services/bundlemgr/src/installd/installd_host_impl.cpp +++ b/services/bundlemgr/src/installd/installd_host_impl.cpp @@ -65,14 +65,14 @@ const std::vector BUNDLE_DATA_DIR = { "/haps" }; constexpr const char* CLOUD_FILE_PATH = "/data/service/el2/%/hmdfs/cloud/data/"; -constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL2 = "/data/service/el2/%/backup/bundles/"; -constexpr const char* DISTRIBUTED_FILE = "/data/service/el2/%/hmdfs/account/data/"; constexpr const char* SHARE_FILE_PATH = "/data/service/el2/%/share/"; -constexpr const char* SHAREFILES_DATA_PATH_EL2 = "/data/app/el2/%/sharefiles/"; constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL1 = "/data/service/el1/%/backup/bundles/"; -constexpr const char* DISTRIBUTED_FILE_NON_ACCOUNT = "/data/service/el2/%/hmdfs/non_account/data/"; -constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL2_NEW = "/data/app/el2/%/base/"; +constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL2 = "/data/service/el2/%/backup/bundles/"; constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL1_NEW = "/data/app/el1/%/base/"; +constexpr const char* BUNDLE_BACKUP_HOME_PATH_EL2_NEW = "/data/app/el2/%/base/"; +constexpr const char* DISTRIBUTED_FILE = "/data/service/el2/%/hmdfs/account/data/"; +constexpr const char* DISTRIBUTED_FILE_NON_ACCOUNT = "/data/service/el2/%/hmdfs/non_account/data/"; +constexpr const char* SHAREFILES_DATA_PATH_EL2 = "/data/app/el2/%/sharefiles/"; constexpr const char* BUNDLE_BACKUP_INNER_DIR = "/.backup"; constexpr const char* EXTENSION_CONFIG_DEFAULT_PATH = "/system/etc/ams_extension_config.json"; #ifdef CONFIG_POLOCY_ENABLE @@ -1194,6 +1194,9 @@ ErrCode InstalldHostImpl::CleanBundleDataDirByName(const std::string &bundleName return ERR_APPEXECFWK_INSTALLD_PARAM_ERROR; } std::string suffixName = bundleName; + if (appIndex > 0) { + suffixName = BundleCloneCommonHelper::GetCloneDataDir(bundleName, appIndex); + } std::vector elPath(ServiceConstants::BUNDLE_EL); elPath.push_back(ServiceConstants::DIR_EL5); for (const auto &el : elPath) { @@ -1201,9 +1204,6 @@ ErrCode InstalldHostImpl::CleanBundleDataDirByName(const std::string &bundleName CleanBundleDataForEl2(bundleName, userid, appIndex); continue; } - if (appIndex > 0) { - suffixName = BundleCloneCommonHelper::GetCloneDataDir(bundleName, appIndex); - } std::string bundleDataDir = GetBundleDataDir(el, userid) + ServiceConstants::BASE + suffixName; if (!InstalldOperator::DeleteFiles(bundleDataDir)) { LOG_W(BMS_TAG_INSTALLD, "clean dir %{public}s failed errno:%{public}d", bundleDataDir.c_str(), errno); @@ -1213,13 +1213,13 @@ ErrCode InstalldHostImpl::CleanBundleDataDirByName(const std::string &bundleName LOG_W(BMS_TAG_INSTALLD, "clean dir %{public}s failed errno:%{public}d", databaseDir.c_str(), errno); } } - CleanShareDir(bundleName, userid); - CleanCloudDir(bundleName, userid); - CleanBackupExtHomeDir(bundleName, userid, DirType::DIR_EL2); - CleanBackupExtHomeDir(bundleName, userid, DirType::DIR_EL1); - CleanNewBackupExtHomeDir(bundleName, userid, DirType::DIR_EL2); - CleanNewBackupExtHomeDir(bundleName, userid, DirType::DIR_EL1); - CleanDistributedDir(bundleName, userid); + CleanShareDir(suffixName, userid); + CleanCloudDir(suffixName, userid); + CleanBackupExtHomeDir(suffixName, userid, DirType::DIR_EL2); + CleanBackupExtHomeDir(suffixName, userid, DirType::DIR_EL1); + CleanNewBackupExtHomeDir(suffixName, userid, DirType::DIR_EL2); + CleanNewBackupExtHomeDir(suffixName, userid, DirType::DIR_EL1); + CleanDistributedDir(suffixName, userid); return ERR_OK; } -- Gitee