From 738a814325e7300ad9cddf86820bcc994031b0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Thu, 14 Nov 2024 06:28:42 +0000 Subject: [PATCH 1/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=97=A5=E5=BF=97=E8=A1=A5=E5=85=85=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index 2eee1cd..bbf1908 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -616,6 +616,7 @@ def is_can_exec(lock_file): current_time = time.time() # 判断锁是否超时 if (current_time - lock_time) < lock_duration: + logger.printLog("******当前执行机已经在执行任务，任务分配失败！******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From 39856dc20aa6c39ddaa8e2ba705fa9a4ce2c84a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Tue, 19 Nov 2024 06:37:25 +0000 Subject: [PATCH 2/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=203863=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BC=96=E8=AF=911?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index bbf1908..7bc08bc 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -617,6 +617,7 @@ def is_can_exec(lock_file): # 判断锁是否超时 if (current_time - lock_time) < lock_duration: logger.printLog("******当前执行机已经在执行任务，任务分配失败！******") + logger.printLog("******任务分配失败！******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From 63f5141341e77494e207f8d459a85f4468308075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Tue, 19 Nov 2024 08:24:58 +0000 Subject: [PATCH 3/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=20=E6=B5=8B=E8=AF=953?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index 7bc08bc..e54832c 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -618,6 +618,7 @@ def is_can_exec(lock_file): if (current_time - lock_time) < lock_duration: logger.printLog("******当前执行机已经在执行任务，任务分配失败！******") logger.printLog("******任务分配失败！******") + logger.printLog("******测试一下是否失败******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From 802a968d3dd2f9d7310d07d11837edcbe1ab402c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Wed, 20 Nov 2024 02:39:59 +0000 Subject: [PATCH 4/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=203863=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=953?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index e54832c..f04c361 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -619,6 +619,7 @@ def is_can_exec(lock_file): logger.printLog("******当前执行机已经在执行任务，任务分配失败！******") logger.printLog("******任务分配失败！******") logger.printLog("******测试一下是否失败******") + logger.printLog("******测试一下是否失败2******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From 2e1fbc15f7848aecc0f507177da02d71c4811110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Wed, 20 Nov 2024 03:45:48 +0000 Subject: [PATCH 5/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=203863=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=954?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index f04c361..1f617ec 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -620,6 +620,7 @@ def is_can_exec(lock_file): logger.printLog("******任务分配失败！******") logger.printLog("******测试一下是否失败******") logger.printLog("******测试一下是否失败2******") + logger.printLog("******测试一下是否失败3******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From 39727e60e761d511373044b7dc8cd8e34fa00bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Wed, 20 Nov 2024 06:03:25 +0000 Subject: [PATCH 6/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=203863=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=955?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index 1f617ec..85cf243 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -621,6 +621,7 @@ def is_can_exec(lock_file): logger.printLog("******测试一下是否失败******") logger.printLog("******测试一下是否失败2******") logger.printLog("******测试一下是否失败3******") + logger.printLog("******测试一下是否失败4******") logger.error("ask is already running. Exiting.") return False else: -- Gitee From da331f3578c2c78c64db1513429ee0c4713520fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=AD=9F=E5=85=83?= Date: Wed, 20 Nov 2024 09:07:55 +0000 Subject: [PATCH 7/7] =?UTF-8?q?update=20DeployDevice/src/func/liteOsUpgrad?= =?UTF-8?q?e/liteOsUpgrade=5FRK3568=5Fapp.py.=203863=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=956?= 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py index 85cf243..774429e 100644 --- a/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py +++ b/DeployDevice/src/func/liteOsUpgrade/liteOsUpgrade_RK3568_app.py @@ -622,6 +622,7 @@ def is_can_exec(lock_file): logger.printLog("******测试一下是否失败2******") logger.printLog("******测试一下是否失败3******") logger.printLog("******测试一下是否失败4******") + logger.printLog("******测试一下是否失败5******") logger.error("ask is already running. Exiting.") return False else: -- Gitee