Sfoglia il codice sorgente

(1)修改install.ini中读取轻量更新包名的Bug
(2)修改PackState到U

80374463 6 anni fa
parent
commit
50a87d26cf
2 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 2 2
      spbase/SpEntityPrivilege.cpp
  2. 2 1
      spbase/sp_cfg.cpp

+ 2 - 2
spbase/SpEntityPrivilege.cpp

@@ -695,7 +695,7 @@ ErrorCodeEnum SpEntityPrivilege::BeginLightInstall(const char *pszPackageName)
 	SHM_ARRAY_PUSH(cfg->install_ini->arr_light_pack, sp_cfg_pack_info_t*) = pack_info;
 
 	inifile_format_write(cfg->install_ini_path, strPackName, "InstalledDate", "0x%08X", y2k_time_now());
-	inifile_write_str(cfg->install_ini_path, strPackName, "PackState", "D");
+	inifile_write_str(cfg->install_ini_path, strPackName, "PackState", "U");
 
 	Dbg("install light pack [%s] succeed", (const char*)strPackName);
 
@@ -877,7 +877,7 @@ ErrorCodeEnum SpEntityPrivilege::BeginSysPackInstall(const char *pszPackageName,
 	strSysPacks += pszPackageName;
 	inifile_write_str(cfg->install_ini_path, "Main", "SysPack", strSysPacks);	
 	inifile_format_write(cfg->install_ini_path, strPackName, "InstalledDate", "0x%08X", y2k_time_now());
-	inifile_write_str(cfg->install_ini_path, strPackName, "PackState", "D");
+	inifile_write_str(cfg->install_ini_path, strPackName, "PackState", "U");
 
 	Dbg("install sys pack [%s] succ", (const char*)strPackName);
 	return Error_Succeed;

+ 2 - 1
spbase/sp_cfg.cpp

@@ -994,7 +994,8 @@ static int load_install_ini(sp_dir_t *dir, sp_cfg_install_ini_t *inst, const cha
 		for (i = 0; i < arr_section->nelts; ++i) {
 			char *sec = ARRAY_IDX(arr_section, i, char*);
 			if (_stricmp(sec, "Main") != 0) {
-				if (isdigit(sec[0])) {		// skip light pack
+				if (isdigit(sec[0]) && ('.' == sec[1] || '.' == sec[2]))	//
+				{		// skip light pack
 					sp_cfg_version_info_t *ver_info = T_MALLOC_T(sp_cfg_version_info_t, shm);
 					memset(ver_info, 0, sizeof(sp_cfg_version_info_t));
 					sscanf(sec, "%d.%d.%d.%d", &ver_info->version.major, &ver_info->version.minor,