Fix: set version info several times to reflect real current git commit

Comment out some functions which are not available in old interface.h

ATBUpdateTool.ini

@@ -6,7 +6,7 @@ plugin-directory="/usr/lib/"
 working-directory="/opt/app/tools/atbupdate/"
 
 [PLUGINS]
-plugin-name="libCAslave.so"
+plugin-name="libCAmaster.so"
 
 [FLAGS]
 no-psa-hardware-update=false

OnDemandUpdatePTU.pro

@@ -104,7 +104,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           Disable EXIT-button for the whole update-process, except for the
 #           checking of the ISMAS-trigger-button (aka WAIT-button).
 VERSION="1.4.0"
-
 # 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

update.cpp

@@ -266,6 +266,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
 
     return false;
 
+#if 0
     QFile fn(fileToSendToDC);
     if (!fn.exists()) {
         // output via CONSOLE() etc
@@ -334,6 +335,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
     }
 
     return true;
+#endif
 }
 
 QString Update::jsonType(enum FileTypeJson type) {
@@ -561,7 +563,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
         }
 
         if (jsonNr != 0) {
-
+#if 0
             m_hw->sys_requestJsonVersions(jsonNr);
             QThread::msleep(500);
 
@@ -579,6 +581,8 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
             if (installedVersion == fileVersion) {
 
             }
+#endif
+
         } else {
             qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
         }

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,11 +424,11 @@ 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);
 
-
     ////////////////////////////////////////////////////////////////////////////
     //
     //               COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY
@@ -445,6 +437,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);
@@ -1190,6 +1183,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);