From 392422f5ad2742299f7929ebd66675f71a2760b2 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Mon, 30 Sep 2024 23:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BD=BF=E7=94=A8retcode?=
 =?UTF-8?q?=E5=88=A4=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/server.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gsuid_core/server.py b/gsuid_core/server.py
index 276e46f..c2f06db 100644
--- a/gsuid_core/server.py
+++ b/gsuid_core/server.py
@@ -265,21 +265,15 @@ def install_dependencies(dependencies: Dict, need_update: bool = False):
             logger.info(f'[安装/更新依赖] {dependency} 中...')
             CMD = f'{start_tool} install "{dependency}{version}" {extra}'
 
-            try:
-                execute_cmd(CMD)
-            except Exception as e1:
-                logger.exception(
-                    f'[安装/更新依赖] 安装失败（将会重试一次）：{e1}'
-                )
+            retcode = execute_cmd(CMD)
+            if retcode != 0:
+                logger.warning('[安装/更新依赖] 安装失败（将会重试一次）')
                 if ' python -m' in start_tool:
                     start_tool = start_tool.replace('python -m', '')
                     CMD = (
                         f'{start_tool} install "{dependency}{version}" {extra}'
                     )
-                try:
-                    execute_cmd(CMD)
-                except Exception as e2:
-                    logger.exception(f'[安装/更新依赖] 安装失败：{e2}')
+                execute_cmd(CMD)
             installed_dependencies = get_installed_dependencies()
 
 
@@ -296,7 +290,7 @@ def execute_cmd(CMD: str):
         logger.success(f"[CMD执行] {CMD} 成功执行!")
     else:
         logger.warning(f"[CMD执行] {CMD}执行失败。错误信息：")
-        logger.warning(result.stderr)
+        logger.exception(result.stderr)
     return result.returncode