(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.

.gitignore

@@ -0,0 +1,2 @@
+tags
+*.tags

OnDemandUpdatePTU.pro

@@ -103,7 +103,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           Move final processing to subclass UpdateProcessRunning.
 #           Disable EXIT-button for the whole update-process, except for the
 #           checking of the ISMAS-trigger-button (aka WAIT-button).
-VERSION="1.4.0"
+# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
+#           first step
+VERSION="1.4.1"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
@@ -117,7 +119,6 @@ VERSION="1.4.0"
 #       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
 #       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
 #       ausgefuehrt.
-#   4:  rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
 #   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
 #       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
 #   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
@@ -133,9 +134,6 @@ VERSION="1.4.0"
 #       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
 #       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
 #       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
-#  10:  Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
-#       Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
-#       zwar auch ohne WAIT-Button.
 #  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
 #  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
 #       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
@@ -249,6 +247,7 @@ HEADERS += \
         process/command.h \
         message_handler.h \
         worker.h \
+        interfaces.h \
         commandline_parser.h \
         plugins/interfaces.h
 

worker.cpp

@@ -358,9 +358,7 @@ void Worker::privateUpdate() {
                 setProgress(i);             // and switch to branch
                 if (m_gc.gitCloneAndCheckoutBranch()) {
                     if (!isRepositoryCorrupted()) {
-                        if (m_versionInfo.size() == 0) {
-                            m_versionInfo = m_gc.gitShowReason(m_branchName);
-                        }
+                        m_versionInfo = m_gc.gitShowReason(m_branchName);
                         GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
                         continueUpdate = true;
                         m_clone = true;
@@ -390,10 +388,7 @@ void Worker::privateUpdate() {
             }
         }
     }
-
-    if (m_versionInfo.size() == 0) {
-        m_versionInfo = m_gc.gitShowReason(m_branchName);
-    }
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
 
     CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
     setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
@@ -411,9 +406,6 @@ void Worker::privateUpdate() {
         }
     }
 
-    qCritical() << "**** m_ismasTriggerActive:" << m_ismasTriggerActive;
-    qCritical() << "****              m_clone:" << m_clone;
-
     if (m_ismasTriggerActive == false) {// make it explicit again: only if the
                                         // ismas trigger is active ('WAIT'),
                                         // then proceed
@@ -432,10 +424,22 @@ void Worker::privateUpdate() {
     if ((continueUpdate = customerEnvironment()) == false) {
         return;
     }
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
     lst = QStringList(QString(smap[UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS]));
     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);
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -445,6 +449,7 @@ void Worker::privateUpdate() {
     if ((continueUpdate = filesToUpdate()) == false) {
         return;
     }
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
     lst = QStringList(QString(smap[UPDATE_STEP::UPDATE_REPOSITORY_SUCCESS]));
     ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY));
     setProgress(_UPDATE_REPOSITORY_SUCCESS);
@@ -475,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
@@ -1037,7 +1029,7 @@ QString Worker::getATBUpdateToolYoctoVersion() {
 
 QString Worker::getAPISMYoctoVersion() {
     if (QFile::exists("/var/lib/opkg/status")) {
-        QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 apism | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
+        QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 -e apism[[:space:]]*$ | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
         Command c("bash");
         if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
             return c.getCommandResult(); // 1.4.1.0-r4
@@ -1190,6 +1182,8 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.versionInfo.created = "N/A";
 
     if (m_versionInfo.size() == 3) {
+        qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
+                    << "m_versionInfo" << m_versionInfo << "*****";
         psaInstalled.versionInfo.lastCommit = m_versionInfo.at(0);
         psaInstalled.versionInfo.reason = m_versionInfo.at(1);
         psaInstalled.versionInfo.created = m_versionInfo.at(2);

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)