openharmony/security_asset
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_asset synced 2024-11-23 15:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove db name bug fix

Browse Source 
Signed-off-by: 尹耀德 <yinyaode1@huawei.com>
This commit is contained in:
尹耀德 2024-09-06 10:28:56 +08:00
parent 77f73beec3
commit 96511c4dcc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/core_service/src/common_event/listener.rs
View File

@ -53,7 +53,9 @@ fn remove_db(file_path: &str, calling_info: &CallingInfo, is_ce: bool) -> Result
for db_path in fs::read_dir(file_path)? {
let db_path = db_path?;
let db_file_name = db_path.file_name().to_string_lossy().to_string();
if db_file_name.contains(&db_name) {
let origin_db_name = format!("{}{}", db_name, DB_SUFFIX);
let backup_db_name = format!("{}{}", origin_db_name, BACKUP_SUFFIX);
if db_file_name == origin_db_name || db_file_name == backup_db_name {
match fs::remove_file(&db_path.path().to_string_lossy().to_string()) {
Ok(_) => (),
Err(e) => {
@ -110,7 +112,7 @@ fn delete_on_package_removed(owner: Vec<u8>, calling_info: &CallingInfo) -> Resu
delete_cond.insert(column::IS_PERSISTENT, Value::Bool(false));
let mut reverse_condition = DbMap::new();
reverse_condition.insert(column::SYNC_TYPE, Value::Number(SyncType::TrustedAccount as u32));
let mut check_cond = DbMap::new();
let check_cond = DbMap::new();
let de_db_data_exists =
delete_in_de_db_on_package_removed(calling_info, &delete_cond, &reverse_condition, &check_cond)?;