From 1de08886917b41c497b9f26a71afde1204130468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Fri, 13 Dec 2024 07:01:41 +0000 Subject: [PATCH 1/2] =?UTF-8?q?cherry=20pick=2044d60c5=20from=20https://gi?= =?UTF-8?q?tee.com/openharmony/developtools=5Fintegration=5Fverification/p?= =?UTF-8?q?ulls/542=20update=20DeployDevice/src/func/liteOsUpgrade/liteOsU?= =?UTF-8?q?pgrade=5FRK3568=5Fapp.py.=20=E5=A2=9E=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=BF=AB=E9=80=9F=E9=80=9A=E8=BF=87=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 贾孟元 --- .../src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index afdb4cc..abac322 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -122,6 +122,12 @@ class liteOsUpgrade_RK3568(BaseApp): logger.info(scriptpath) local_image_path = os.path.join(version_savepath) logger.info(local_image_path) + # 判断是否存在smoke_check.json文件 + smoke_check_file = os.path.join(local_image_path, 'smoke_check.json') + if os.path.exists(smoke_check_file): + logger.info("smoke_check.json file exist, return True directly, file path is %s" % smoke_check_file) + delete_file_lock(lock_file) + return True if system_type == "Windows": loader_tool_path = os.path.join(scriptpath, "resource", "RK3568_tool", "upgrade_tool.exe") else: -- Gitee From b313d4dd07e71607dc9f920eee13e1e1f7d030c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Fri, 6 Dec 2024 03:19:10 +0000 Subject: [PATCH 2/2] =?UTF-8?q?cherry=20pick=203dfbda2=20from=20https://gi?= =?UTF-8?q?tee.com/openharmony/developtools=5Fintegration=5Fverification/p?= =?UTF-8?q?ulls/542=20update=20DeployDevice/src/func/liteOsUpgrade/liteOsU?= =?UTF-8?q?pgrade=5FRK3568=5Fapp.py.=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=94=81=E8=BF=9B=E8=A1=8C10=E7=A7=92?= =?UTF-8?q?=E5=86=85=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 贾孟元 --- DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index abac322..9f58161 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -619,6 +619,8 @@ def is_can_exec(lock_file): lock_time = os.path.getmtime(lock_file) current_time = time.time() # 判断锁是否超时 + if (current_time - lock_time) < 10: + return True if (current_time - lock_time) < lock_duration: logger.error("ask is already running. Exiting.") return False -- Gitee