sprintfix: 修复 Proxy 文件同步扫描不存在文件创建时间戳的问题 (fixed #1732)

TencentBlueKing · Aug 28, 2023 · f9f8099 · f9f8099
1 parent 2dc4c7a
commit f9f8099
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/script_tools/setup_pagent.py b/script_tools/setup_pagent.py
@@ -134,10 +134,11 @@ class ExecuteWinCmdError(Exception):
 
 try:
     # import 3rd party libraries here, in case the python interpreter does not have them
-    import impacket  # noqa
     import paramiko  # noqa
     import requests  # noqa
 
+    import impacket  # noqa
+
     # import psutil
 
 except ImportError as err:
@@ -369,13 +370,14 @@ def download_file(url: str, dest_dir: str):
         # NOTE the stream=True parameter below
         local_file = os.path.join(dest_dir, local_filename)
 
-        # 如果修改时间临近，跳过下载，避免多个 setup 脚本文件互相覆盖
-        mtimestamp: float = os.path.getmtime(local_file)
-        if time.time() - mtimestamp < 10:
-            report_log(
-                "download_file", f"File download skipped due to sync time approaching, mtimestamp -> {mtimestamp}"
-            )
-            return
+        if os.path.exists(local_file):
+            # 如果修改时间临近，跳过下载，避免多个 setup 脚本文件互相覆盖
+            mtimestamp: float = os.path.getmtime(local_file)
+            if time.time() - mtimestamp < 10:
+                report_log(
+                    "download_file", f"File download skipped due to sync time approaching, mtimestamp -> {mtimestamp}"
+                )
+                return
 
         r = requests.get(url, stream=True)
         r.raise_for_status()

diff --git a/script_tools/setup_pagent2.py b/script_tools/setup_pagent2.py
@@ -74,10 +74,11 @@ def arg_parser() -> argparse.ArgumentParser:
 
 try:
     # import 3rd party libraries here, in case the python interpreter does not have them
-    import impacket  # noqa
     import paramiko  # noqa
     import requests  # noqa
 
+    import impacket  # noqa
+
     # import psutil
 
 except ImportError as err:
@@ -415,13 +416,14 @@ def download_file(url: str, dest_dir: str):
         # NOTE the stream=True parameter below
         local_file = os.path.join(dest_dir, local_filename)
 
-        # 如果修改时间临近，跳过下载，避免多个 setup 脚本文件互相覆盖
-        mtimestamp: float = os.path.getmtime(local_file)
-        if time.time() - mtimestamp < 10:
-            logger.logging(
-                "download_file", f"File download skipped due to sync time approaching, mtimestamp -> {mtimestamp}"
-            )
-            return
+        if os.path.exists(local_file):
+            # 如果修改时间临近，跳过下载，避免多个 setup 脚本文件互相覆盖
+            mtimestamp: float = os.path.getmtime(local_file)
+            if time.time() - mtimestamp < 10:
+                logger.logging(
+                    "download_file", f"File download skipped due to sync time approaching, mtimestamp -> {mtimestamp}"
+                )
+                return
 
         r = requests.get(url, stream=True)
         r.raise_for_status()