diff --git a/services/include/script/script_manager.h b/services/include/script/script_manager.h index 602f65adc05ea4763a83f4a85bd5622b0d6d6a93..b7f7e05877f27f8c4f91cda85f777aaab6083ac9 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 49217dfe33a0d6c79cd8313bff304cc6b9da41aa..7d0e92e47c6ac296733aefe9bdbd237a50c54305 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 c4e37268bd50af12d6003fbd3e94c8f5f2f8f4d0..b204ba9cae0950f25bb18b0ae33283f2a0bbd316 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; }