From a2407119465db1c76d152a6ea7578ee92a9fe4cc Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 27 Feb 2024 13:56:38 +0100 Subject: [PATCH] (R)sync files of customer repository (under ./etc in the repository) with file-susyem /etc as very forst step of the update process, even before executing the opkg commands. --- worker.cpp | 25 ++++++++++++------------- worker.h | 12 ++++++------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/worker.cpp b/worker.cpp index 85ab721..494c28d 100644 --- a/worker.cpp +++ b/worker.cpp @@ -429,6 +429,18 @@ void Worker::privateUpdate() { ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH); setProgress(_CHECKOUT_BRANCH_SUCCESS); + //////////////////////////////////////////////////////////////////////////// + // + // (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM + // + //////////////////////////////////////////////////////////////////////////// + if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) { + return; + } + lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS])); + ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS)); + setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS); + //////////////////////////////////////////////////////////////////////////// // // COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY @@ -468,19 +480,6 @@ void Worker::privateUpdate() { ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE)); setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS); - - //////////////////////////////////////////////////////////////////////////// - // - // (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM - // - //////////////////////////////////////////////////////////////////////////// - if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) { - return; - } - lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS])); - ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS)); - setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS); - //////////////////////////////////////////////////////////////////////////// // // FUTURE: SAVE LOG FILES diff --git a/worker.h b/worker.h index f86c94c..5b5faf2 100644 --- a/worker.h +++ b/worker.h @@ -61,9 +61,12 @@ #define _UPDATE_REPOSITORY_SUCCESS (27) #define _CHECK_FOR_REPOSITORY_CHANGES (28) #define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29) -#define _FILES_TO_UPDATE (30) -#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (31) -#define _FILES_TO_DOWNLOAD (32) +#define _SYNC_CUSTOMER_REPOSITORY (30) +#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (31) +#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (32) +#define _FILES_TO_UPDATE (33) +#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (34) +#define _FILES_TO_DOWNLOAD (35) #define _EXEC_OPKG_COMMANDS (41) #define _EXEC_OPKG_COMMAND_1 (42) #define _EXEC_OPKG_COMMAND_2 (43) @@ -86,9 +89,6 @@ #define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86) #define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87) #define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88) -#define _SYNC_CUSTOMER_REPOSITORY (89) -#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (90) -#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (91) #define _SAVE_LOGS (92) #define _SAVE_LOGS_FAILURE (93) #define _SAVE_LOGS_SUCCESS (94)