From 08b16a8bb88898493183311d5544e9596881e213 Mon Sep 17 00:00:00 2001
From: Rayllll <leizhonghang@huawei.com>
Date: Thu, 16 Jan 2025 23:00:46 +0800
Subject: [PATCH 1/3] Signed-off-by: Rayllll <leizhonghang@huawei.com>

modify process
---
 services/updater_main.cpp | 32 ++++++++++++++++----------------
 services/updater_main.h   |  2 ++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/services/updater_main.cpp b/services/updater_main.cpp
index f098b645..8053a137 100644
--- a/services/updater_main.cpp
+++ b/services/updater_main.cpp
@@ -392,20 +392,13 @@ static int CheckMountData()
 
 static UpdaterStatus CheckVerifyPackages(UpdaterParams &upParams)
 {
-    // verify packages first
-    UpdaterStatus status = VerifyPackages(upParams);
-    if (NotifyActionResult(upParams, status, {SET_INSTALL_STATUS}) != UPDATE_SUCCESS) {
-        LOG(ERROR) << "set status fail";
-        return UPDATE_CORRUPT;
-    }
-    if (status != UPDATE_SUCCESS) {
-        return UPDATE_CORRUPT;
-    }
-    if (NotifyActionResult(upParams, status, {PROCESS_PACKAGE, GET_INSTALL_STATUS}) != UPDATE_SUCCESS) {
+    UpdaterStatus status = UPDATE_SUCCESS;
+    if (NotifyActionResult(upParams, status, {PROCESS_PACKAGE, SET_INSTALL_STATUS, GET_INSTALL_STATUS})
+        != UPDATE_SUCCESS) {
         LOG(ERROR) << "notify action fail";
         return UPDATE_CORRUPT;
     }
-    return UPDATE_SUCCESS;
+    return status;
 }
 
 static UpdaterStatus PreUpdatePackages(UpdaterParams &upParams)
@@ -430,8 +423,8 @@ static UpdaterStatus PreUpdatePackages(UpdaterParams &upParams)
         return UPDATE_SUCCESS;
     }
 
-    if (CheckVerifyPackages(upParams) != UPDATE_SUCCESS) {
-        LOG(ERROR) << "verify packages fail";
+    // verify package first
+    if (VerifyPackages(upParams) != UPDATE_SUCCESS) {
         return UPDATE_CORRUPT;
     }
 
@@ -455,6 +448,10 @@ static UpdaterStatus PreUpdatePackages(UpdaterParams &upParams)
         return UPDATE_ERROR;
     }
 #endif
+    if (CheckVerifyPackages(upParams) != UPDATE_SUCCESS) {
+        LOG(ERROR) << "verify packages fail";
+        return UPDATE_CORRUPT;
+    }
     return UPDATE_SUCCESS;
 }
 
@@ -593,9 +590,8 @@ static UpdaterStatus PreSdcardUpdatePackages(UpdaterParams &upParams)
         LOG(ERROR) << "Battery is not sufficient for install package.";
         return UPDATE_SKIP;
     }
-
-    if (CheckVerifyPackages(upParams) != UPDATE_SUCCESS) {
-        LOG(ERROR) << "verify packages fail";
+    UpdaterStatus status = VerifyPackages(upParams);
+    if (VerifyPackages(upParams) != UPDATE_SUCCESS) {
         return UPDATE_CORRUPT;
     }
 #ifdef UPDATER_USE_PTABLE
@@ -604,6 +600,10 @@ static UpdaterStatus PreSdcardUpdatePackages(UpdaterParams &upParams)
         return UPDATE_ERROR;
     }
 #endif
+    if (CheckVerifyPackages(upParams) != UPDATE_SUCCESS) {
+        LOG(ERROR) << "verify packages fail";
+        return UPDATE_CORRUPT;
+    }
     return UPDATE_SUCCESS;
 }
 
diff --git a/services/updater_main.h b/services/updater_main.h
index ccf74b1c..908a6bfa 100644
--- a/services/updater_main.h
+++ b/services/updater_main.h
@@ -71,6 +71,8 @@ void UpdaterVerifyFailEntry(bool verifyret);
 bool IsSpareBoardBoot(void);
 bool IsNeedWipe();
 void NotifyReboot(const std::string& rebootTarget, const std::string &rebootReason, const std::string &extData = "");
+UpdaterStatus NotifyActionResult(UpdaterParams &upParams,
+    UpdaterStatus &status, const std::vector<NotifyAction> &notifyActionVec);
 #ifdef __cplusplus
 #if __cplusplus
 }
-- 
Gitee


From be5b0d053e3010d983bed301be04c7e13196d184 Mon Sep 17 00:00:00 2001
From: Rayllll <leizhonghang@huawei.com>
Date: Thu, 16 Jan 2025 15:19:30 +0000
Subject: [PATCH 2/3] update services/updater_main.cpp.

Signed-off-by: Rayllll <leizhonghang@huawei.com>
---
 services/updater_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/updater_main.cpp b/services/updater_main.cpp
index 8053a137..da3a92f9 100644
--- a/services/updater_main.cpp
+++ b/services/updater_main.cpp
@@ -591,7 +591,7 @@ static UpdaterStatus PreSdcardUpdatePackages(UpdaterParams &upParams)
         return UPDATE_SKIP;
     }
     UpdaterStatus status = VerifyPackages(upParams);
-    if (VerifyPackages(upParams) != UPDATE_SUCCESS) {
+    if (status != UPDATE_SUCCESS) {
         return UPDATE_CORRUPT;
     }
 #ifdef UPDATER_USE_PTABLE
-- 
Gitee


From 561a642b617bce99761a69c9fcf9e3c95ce43147 Mon Sep 17 00:00:00 2001
From: Rayllll <leizhonghang@huawei.com>
Date: Thu, 16 Jan 2025 15:29:34 +0000
Subject: [PATCH 3/3] update services/updater_main.cpp.

Signed-off-by: Rayllll <leizhonghang@huawei.com>
---
 services/updater_main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/updater_main.cpp b/services/updater_main.cpp
index da3a92f9..0009cacb 100644
--- a/services/updater_main.cpp
+++ b/services/updater_main.cpp
@@ -393,8 +393,8 @@ static int CheckMountData()
 static UpdaterStatus CheckVerifyPackages(UpdaterParams &upParams)
 {
     UpdaterStatus status = UPDATE_SUCCESS;
-    if (NotifyActionResult(upParams, status, {PROCESS_PACKAGE, SET_INSTALL_STATUS, GET_INSTALL_STATUS})
-        != UPDATE_SUCCESS) {
+    if (NotifyActionResult(upParams, status, {PROCESS_PACKAGE, SET_INSTALL_STATUS, GET_INSTALL_STATUS}) !=
+        UPDATE_SUCCESS) {
         LOG(ERROR) << "notify action fail";
         return UPDATE_CORRUPT;
     }
-- 
Gitee