Z991239-5733 #comment feat: 修复安装时的bug

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1623,11 +1623,12 @@ namespace Task
 			int  failStatus=0;//安装失败状态：0:失败，1：成功，-1:未知  
 			string packName = m_fsm->m_currentTask.pack_name.GetData();
 			CSimpleStringA errMsg ="";
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("InstallPackTask")("======begin ExecInstall======");
 			if (!m_fsm->m_TempDepUpgradeFlag) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("InstallPackTask")("======begin ExecInstall======");
 				failStatus = m_fsm->ExecInstall(errMsg);
 			}
 			else {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("InstallPackTask")("======begin dep ExecInstall======");
 				failStatus = m_fsm->ExecDepInstall(errMsg);
 			}
 			if(failStatus == 1){
@@ -4415,6 +4416,7 @@ ErrorCodeEnum CUpgradeTaskFSM::RollBackVersionCheck(string& failReason, CSimpleS
 
 void CUpgradeTaskFSM::judgeTaskClass()
 {
+	m_TempDepUpgradeFlag = false;//每次安装前初始化。
 	//临时方案判定是适配器升级还是应用升级
 	if (isTerminalInstall()) {
 		//安装时判断
@@ -4578,10 +4580,10 @@ int CUpgradeTaskFSM::ExecDepInstall(CSimpleStringA& strErrMsg)
 	if (!m_currentTask.install_step.empty()) {
 
 		int iCount = m_currentTask.install_step.size();
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecInstall")("install cmd size = %d", iCount);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("install Dep cmd size = %d", iCount);
 		for (int j = 0; j < iCount; j++) {
 			CInstallStep* tmp = m_currentTask.install_step.front();
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecInstall")("=====begin cmd=[%s]=====", tmp->cmdType.GetData());
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("=====begin Dep cmd=[%s]=====", tmp->cmdType.GetData());
 			//开始处理具体命令
 			if (tmp->cmdType == "Delete") {
 				bool ret = ExecDepDeleteCmd(strErrMsg, tmp);
@@ -4637,11 +4639,11 @@ int CUpgradeTaskFSM::ExecDepInstall(CSimpleStringA& strErrMsg)
 				}
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecInstall")("cmd=[%s] is invalid", tmp->cmdType.GetData());
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("cmd=[%s] is invalid", tmp->cmdType.GetData());
 				iRet = 0;
 				break;//命令无效直接退出
 			}
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecInstall")("=====end cmd=[%s]=====", tmp->cmdType.GetData());
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("=====end Dep cmd=[%s]=====", tmp->cmdType.GetData());
 			m_currentTask.install_step.pop();//去除元素
 			delete tmp;//删除内存
 		}