浏览代码

Z991239-5787 #comment feat: 优化升级中拷贝原imdep和res文件夹的处理逻辑

Signed-Off-By: commit-hook
刘文涛80174520 1 年之前
父节点
当前提交
1453d3ad98
共有 1 个文件被更改,包括 3 次插入15 次删除
  1. 3 15
      Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

+ 3 - 15
Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1691,7 +1691,7 @@ namespace Task
 }
 
 //完成
-// 创建新版本目录,拷贝当前版本bin、cfg、dep、mod、imdep、res、install.ini,并修改Shell.ini相关配置
+// 创建新版本目录,拷贝当前版本bin、cfg、dep、mod、imdep、res
 ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSimpleStringA &strErrInfo)
 {
 	// 创建安装包日志文件
@@ -1830,13 +1830,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSim
 	}
 	else
 	{
-		if (!CreateDirA(strDest, TRUE))
-		{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create res dir fail");
-			strErrInfo = "create res dir fail";
-			return Error_Unexpect;
-		}
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create res dir succ");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("res dir is not exist,ignore copy");
 	}
 
 	strSource = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "imdep", strCurVerPath.GetData());
@@ -1855,13 +1849,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSim
 	}
 	else
 	{
-		if (!CreateDirA(strDest, TRUE))
-		{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create imdep dir fail");
-			strErrInfo = "create imdep dir fail";
-			return Error_Unexpect;
-		}
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create imdep dir succ");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("imdep dir is not exist,ignore copy");
 	}
 	return Error_Succeed;
 }