From 79595d3053d051d854d6adb836bef345c15a2799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Fri, 30 Aug 2024 06:52:57 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- .../firmware/upgrade/install/src/firmware_updater_install.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/firmware/upgrade/install/src/firmware_updater_install.cpp b/services/firmware/upgrade/install/src/firmware_updater_install.cpp index 578f8757..252d482d 100644 --- a/services/firmware/upgrade/install/src/firmware_updater_install.cpp +++ b/services/firmware/upgrade/install/src/firmware_updater_install.cpp @@ -53,8 +53,8 @@ int32_t UpdaterInstall::DoUpdaterInstall(const std::vector &c installFiles.push_back(component.second); } sleep(1); - bool ret = RebootAndInstallUpgradePackage("/misc", installFiles); - if (!ret) { + int32_t ret = RebootAndInstallUpgradePackage("/misc", installFiles); + if (ret != 0) { FIRMWARE_LOGE("RebootAndInstallUpgradePackage fail %{public}d", ret); errMsg_.errorCode = DUPDATE_ERR_UPDATE_REBOOT_FAIL; errMsg_.errorMessage = "updater install is failed"; -- Gitee From ac46b3828ff102fa966d5cc34a2166cae7de218d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Fri, 30 Aug 2024 07:11:45 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- .../firmware/upgrade/install/src/firmware_updater_install.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/firmware/upgrade/install/src/firmware_updater_install.cpp b/services/firmware/upgrade/install/src/firmware_updater_install.cpp index 252d482d..1629c65c 100644 --- a/services/firmware/upgrade/install/src/firmware_updater_install.cpp +++ b/services/firmware/upgrade/install/src/firmware_updater_install.cpp @@ -57,7 +57,7 @@ int32_t UpdaterInstall::DoUpdaterInstall(const std::vector &c if (ret != 0) { FIRMWARE_LOGE("RebootAndInstallUpgradePackage fail %{public}d", ret); errMsg_.errorCode = DUPDATE_ERR_UPDATE_REBOOT_FAIL; - errMsg_.errorMessage = "updater install is failed"; + errMsg_.errorMessage = "updater install is failed, ret = " + std::to_string(ret); return OHOS_FAILURE; } return OHOS_SUCCESS; -- Gitee