From c19adbc10675b55bf86516a5469ea079a21d3f4f Mon Sep 17 00:00:00 2001 From: "chenglei16@huawei.com" Date: Tue, 5 Aug 2025 19:26:28 +0800 Subject: [PATCH] script add updater mode Signed-off-by: chenglei16@huawei.com --- services/include/script/script_manager.h | 1 + services/script/script_interpreter/script_interpreter.cpp | 4 ++-- services/updater_binary/update_processor.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/include/script/script_manager.h b/services/include/script/script_manager.h index 602f65ad..b7f7e058 100644 --- a/services/include/script/script_manager.h +++ b/services/include/script/script_manager.h @@ -36,6 +36,7 @@ enum { USCRIPT_ERROR_EXECUTE, USCRIPT_ERROR_INTERPRET, USCRIPT_ERROR_CREATE_THREAD, + USCRIPT_UPDATER_MODE_VALUE, }; /** diff --git a/services/script/script_interpreter/script_interpreter.cpp b/services/script/script_interpreter/script_interpreter.cpp index 49217dfe..7d0e92e4 100644 --- a/services/script/script_interpreter/script_interpreter.cpp +++ b/services/script/script_interpreter/script_interpreter.cpp @@ -194,7 +194,7 @@ UScriptValuePtr ScriptInterpreter::ExecuteNativeFunc(UScriptContextPtr context, } if (params == nullptr) { int32_t ret = instruction->Execute(*scriptManager_->GetScriptEnv(name), *funcContext.get()); - if (ret != USCRIPT_SUCCESS) { + if (ret != USCRIPT_SUCCESS && ret != USCRIPT_UPDATER_MODE_VALUE) { error->SetValue(ret); return error; } @@ -222,7 +222,7 @@ UScriptValuePtr ScriptInterpreter::ExecuteNativeFunc(UScriptContextPtr context, int32_t ret = instruction->Execute(*scriptManager_->GetScriptEnv(name), *funcContext.get()); INTERPRETER_LOGI(*this, context, "ExecuteNativeFunc::Execute %s result: %d", name.c_str(), ret); - if (ret != USCRIPT_SUCCESS) { + if (ret != USCRIPT_SUCCESS && ret != USCRIPT_UPDATER_MODE_VALUE) { error->SetValue(ret); return error; } diff --git a/services/updater_binary/update_processor.cpp b/services/updater_binary/update_processor.cpp index c4e37268..b204ba9c 100644 --- a/services/updater_binary/update_processor.cpp +++ b/services/updater_binary/update_processor.cpp @@ -533,7 +533,7 @@ int ProcessUpdater(bool retry, int pipeFd, const std::string &packagePath, const int32_t UScriptInstructionIsUpdaterMode::Execute(Uscript::UScriptEnv &env, Uscript::UScriptContext &context) { - int32_t ret = Utils::IsUpdaterMode() ? USCRIPT_ERROR_EXECUTE : USCRIPT_SUCCESS; + int32_t ret = Utils::IsUpdaterMode() ? USCRIPT_UPDATER_MODE_VALUE : USCRIPT_SUCCESS; context.PushParam(ret); return ret; } -- Gitee