Z991239-5733 #comment feat: 修复升级回退bug

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1660,7 +1660,7 @@ namespace Task
 			CSimpleStringA strErrMsg = "";
 			//判定是适配器or应用回退
 			CSimpleStringA verDirName = m_fsm->m_currentTask.pack_version.GetData();
-			if(m_fsm->judgeRollbackTaskClass(verDirName,failReason,strErrMsg))
+			if(m_fsm->judgeRollbackTaskClass(verDirName,failReason,strErrMsg)==Error_Succeed)
 			{
 				if (!m_fsm->m_TempDepUpgradeFlag) {
 					//升级回退
@@ -7152,7 +7152,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 		}
 		else {
 			//失败
-			if (pEvent->failReason.compare("C")==0) {
+			if (pEvent->failReason.compare("X") != 0) {
 				//回退失败，设置状态为C
 				if (SetRunConfigStrValue("upgradeTask", "PendingState", "C") == Error_Succeed) {
 					//回滚失败取消
@@ -7161,7 +7161,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					up.installVersion = m_currentTask.pack_version;//回退的版本
 					up.CurrentVersion = getAlarmCurrVersion();//当前的版本
 					up.cInstallState = "C";
-					up.strInstallComment = pEvent->errMsg;//错误信息
+					up.strInstallComment = pEvent->errMsg.GetData();//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_ROLLBACK_ID,"RTA5668");
 
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RollBackCheck is fail ,prepare to s2");
@@ -7184,7 +7184,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					up.installVersion = m_currentTask.pack_version;//回退的版本
 					up.CurrentVersion = getAlarmCurrVersion();//当前的版本
 					up.cInstallState = "X";
-					up.strInstallComment = pEvent->errMsg;//错误信息
+					up.strInstallComment = pEvent->errMsg.GetData();//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_ROLLBACK_ID,"RTA5669");
 
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RollBackCheck is fail ,prepare to s2");