UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -113,10 +113,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           Move rsyncing of the customer-repository after the actual fetching
 #           of the repository. Otherwise, the update of, for instance
 #           tariff-files, would always be a step behind.
-# 1.4.5   : In case a new branch has been created in a remote
-#           customer-repository (e.g. origin/zg1/zone101), then fetch/pull
-#           this branch before switching to this now locally existen branch.
-VERSION="1.4.5"
+VERSION="1.4.4"
 # 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

UpdatePTUDevCtrl/git/git_client.cpp

@@ -6,7 +6,6 @@
 #include <QRegularExpression>
 #include <QDebug>
 #include <QDir>
-#include <QStringList>
 
 
 GitClient::GitClient(QString const &customerNrStr,
@@ -291,100 +290,6 @@ bool GitClient::gitFsck() {
     }
     return r;
 }
-
-bool GitClient::branchExistsRemotely() {
-    bool remoteBranchExists = false;
-    if (QDir(m_customerRepository).exists()) {
-        qInfo() << "BRANCH NAME" << m_branchName;
-        QString const cmd = QString("git ls-remote --exit-code --heads origin %1").arg(m_branchName);
-        Command c(cmd);
-        if (c.execute(m_customerRepository)) {
-            // expected result: c16c833c8778c1b3691a74afee5a469177e4e69b refs/heads/zg1/zone1000
-            QString const s = c.getCommandResult().trimmed();
-
-
-            if (!s.isEmpty()) {
-                // the result is only one line
-                if ((remoteBranchExists = s.contains(m_branchName)) == true) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") branch"
-                                << m_branchName << "EXISTS REMOTELY. (" << s << ")";
-                }
-            } else {
-                Utils::printCriticalErrorMsg(QString("EMPTY RESULT FOR CMD %1").arg(cmd));
-            }
-        } else {
-            Utils::printCriticalErrorMsg(QString("FAILED TO EXEC '%1'").arg(cmd));
-        }
-    }
-    return remoteBranchExists;
-}
-
-bool GitClient::branchExistsLocally() {
-    Command c("git branch -l");
-    if (c.execute(m_customerRepository)) {
-        QString const s = c.getCommandResult().trimmed();
-        if (!s.isEmpty()) {
-            QStringList lines = Update::split(s, '\n');
-            if (!lines.empty()) {
-                for (int i=0; i < lines.size(); ++i) {
-                    QString line = lines.at(i);
-                    // expected: * [new branch]      zg1/zone12 -> origin/zg1/zone12"
-                    if (line.contains(m_branchName)) {
-                        if (m_worker) {
-                            QStringList lst(QString("BRANCH-NAME %1 CONTAINED IN RESULT %2").arg(m_branchName).arg(s));
-                            m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH;
-                        }
-                        return true;
-                    }
-                }
-
-                if (m_worker) {
-                    QStringList lst(QString("BRANCH-NAME %1 NOT CONTAINED IN RESULT %2").arg(m_branchName).arg(s));
-                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
-                }
-
-            } else {
-                if (m_worker) {
-                    QStringList lst(QString("'git branch -l' RETURNED NO LINES"));
-                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
-                }
-            }
-        } else {
-            if (m_worker) {
-                QStringList lst(QString("'git branch -l' RETURNED EMPTY RESULT"));
-                m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
-            }
-        }
-    } else {
-        if (m_worker) {
-            QStringList lst(QString("FAILED TO EXEC 'git branch -l'"));
-            m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
-        }
-    }
-
-    return false;
-}
-
-bool GitClient::gitPullNewBranches() {
-
-    if (QDir(m_customerRepository).exists()) {
-        Command c("git pull");
-        if (c.execute(m_customerRepository)) {
-            QString const s = c.getCommandResult().trimmed();
-            // expected: Already up-to-date.
-            if (!s.isEmpty()) {
-                QStringList lst;
-                QString msg(QString("GIT-PULL-NEW-BRANCH. RESULT=%1").arg(s));
-                if (m_worker) {
-                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH;
-                }
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
 /*
  Hat sich nichts geaendert, so werden auch keine Commits <>..<> angezeigt
  */

UpdatePTUDevCtrl/git/git_client.h

@@ -57,10 +57,6 @@ class GitClient : public QObject {
     static QString gitBlob(QString fileName);
     QString gitCommitForBlob(QString blob);
     bool gitIsFileTracked(QString file2name);
-
-    bool branchExistsRemotely();
-    bool branchExistsLocally();
-    bool gitPullNewBranches();
 };
 
 #endif // GIT_CLIENT_H_INCLUDED

UpdatePTUDevCtrl/update.cpp

@@ -670,18 +670,10 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
     return false;
 }
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
-
-    int tries = 20;
-    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
-        // must deliver 'true', only then are all data from hwapi valid
-        if (--tries < 0) {
-            Utils::printCriticalErrorMsg("ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED");
+    if (m_sys_areDCdataValid == false) {
+        qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
         return false;
     }
-        Utils::printCriticalErrorMsg("DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED");
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
-    }
 
     bool res = false;
     bool dcDownloadPossible = true;

UpdatePTUDevCtrl/worker.cpp

@@ -56,9 +56,6 @@ const QMap<UPDATE_STEP, const char*> Worker::smap (
         INSERT_ELEMENT(UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE),
         INSERT_ELEMENT(UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER),
         INSERT_ELEMENT(UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER),
-        INSERT_ELEMENT(UPDATE_STEP::PULL_NEW_BRANCH),
-        INSERT_ELEMENT(UPDATE_STEP::PULL_NEW_BRANCH_FAILURE),
-        INSERT_ELEMENT(UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::CHECKOUT_BRANCH),
         INSERT_ELEMENT(UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::CHECKOUT_BRANCH_FAILURE),
@@ -333,7 +330,6 @@ void Worker::privateUpdate() {
     m_clone = false;
     m_repairClone = false;
     m_initialClone = false;
-    m_pulledNewBranch = false;
                                     // the customer repository is cloned or
                                     // repaired/re-cloned without checking the
                                     // ISMAS-trigger (WAIT-)button.
@@ -728,35 +724,6 @@ bool Worker::customerEnvironment() {
     ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::CHECKOUT_BRANCH));
 
     if (QDir(m_customerRepository).exists()) {
-        if (m_clone == false) {
-            if (m_gc.branchExistsRemotely()) {
-                QString msg("PULL NEW BRANCH " + m_branchName);
-                QStringList lst(msg);
-                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH));
-                if (!m_gc.branchExistsLocally()) {
-                    msg = QString("PULLING OF NEW BRANCH " + m_branchName + " DOES NOT EXIST LOCALLY");
-                    QStringList lst(msg);
-                    CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH;
-                    if (!m_gc.gitPullNewBranches()) {
-                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + "FAILED");
-                        QStringList lst(msg);
-                        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_FAILURE)));
-                        return false;
-                    } else {
-                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + "SUCCESS");
-                        QStringList lst(msg);
-                        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
-                        m_pulledNewBranch = true;
-                    }
-                } else {
-                    msg = QString("PULLING ALREADY EXISTING LOCAL BRANCH " + m_branchName + "SUCCESS");
-                    QStringList lst(msg);
-                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
-                    m_pulledNewBranch = true;
-                }
-            }
-        }
-
         if (m_gc.gitCheckoutBranch()) {
             return true;
         } else {
@@ -780,7 +747,7 @@ bool Worker::filesToUpdate() {
     // always execute contents of opkg_commands-file
     m_filesToUpdate << "etc/psa_update/opkg_commands";
 
-    if ((m_clone || m_pulledNewBranch) && m_alwaysDownloadConfig) {
+    if (m_clone && m_alwaysDownloadConfig) {
         // always download all json-config files, even if none of them have been
         // changed in the git repository. useful for first installation.
         QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
@@ -794,7 +761,7 @@ bool Worker::filesToUpdate() {
         }
     }
 
-    if ((m_clone || m_pulledNewBranch) && m_alwaysDownloadConfig) {
+    if (m_clone && m_alwaysDownloadDC) {
         // always download the last dc-binary, even if not changed in the
         // git repository. useful for first installation.
         QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/dc"));

UpdatePTUDevCtrl/worker.h

@@ -53,41 +53,38 @@
 #define _CHECK_ISMAS_TRIGGER_WRONG_VALUE            (19)
 #define _CHECK_ISMAS_TRIGGER_SUCCESS                (20)
 #define _CHECK_ISMAS_TRIGGER_FAILURE                (21)
-#define _PULL_NEW_BRANCH                            (22)
-#define _PULL_NEW_BRANCH_FAILURE                    (23)
-#define _PULL_NEW_BRANCH_SUCCESS                    (24)
-#define _CHECKOUT_BRANCH                            (25)
-#define _CHECKOUT_BRANCH_FAILURE                    (26)
-#define _CHECKOUT_BRANCH_SUCCESS                    (27)
-#define _UPDATE_REPOSITORY                          (28)
-#define _UPDATE_REPOSITORY_FAILURE                  (29)
-#define _UPDATE_REPOSITORY_SUCCESS                  (30)
-#define _CHECK_FOR_REPOSITORY_CHANGES               (31)
-#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS       (32)
-#define _SYNC_CUSTOMER_REPOSITORY                   (33)
-#define _SYNC_CUSTOMER_REPOSITORY_FAILURE           (34)
-#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS           (35)
-#define _FILES_TO_UPDATE                            (36)
-#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE       (37)
-#define _FILES_TO_DOWNLOAD                          (38)
-#define _EXEC_OPKG_COMMANDS                         (39)
-#define _EXEC_OPKG_COMMAND_1                        (40)
-#define _EXEC_OPKG_COMMAND_2                        (41)
-#define _EXEC_OPKG_COMMAND_3                        (42)
-#define _EXEC_OPKG_COMMAND_4                        (43)
-#define _EXEC_OPKG_COMMAND_5                        (44)
-#define _EXEC_OPKG_COMMAND_6                        (45)
-#define _EXEC_OPKG_COMMAND_7                        (46)
-#define _EXEC_OPKG_COMMAND_8                        (47)
-#define _EXEC_OPKG_COMMAND_9                        (48)
-#define _EXEC_OPKG_COMMAND_LAST                     (49)
-#define _EXEC_OPKG_COMMAND_FAILURE                  (50)
-#define _EXEC_OPKG_COMMAND_SUCCESS                  (51)
-#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (60)
-#define _DOWNLOAD_CONFIG_FILE                       (61)
-#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (62)
-#define _DOWNLOAD_CONFIG_FILE_FAILURE               (63)
-#define _DOWNLOAD_DEVICE_CONTROLLER                 (64)
+#define _CHECKOUT_BRANCH                            (22)
+#define _CHECKOUT_BRANCH_FAILURE                    (23)
+#define _CHECKOUT_BRANCH_SUCCESS                    (24)
+#define _UPDATE_REPOSITORY                          (25)
+#define _UPDATE_REPOSITORY_FAILURE                  (26)
+#define _UPDATE_REPOSITORY_SUCCESS                  (27)
+#define _CHECK_FOR_REPOSITORY_CHANGES               (28)
+#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS       (29)
+#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)
+#define _EXEC_OPKG_COMMAND_3                        (44)
+#define _EXEC_OPKG_COMMAND_4                        (45)
+#define _EXEC_OPKG_COMMAND_5                        (46)
+#define _EXEC_OPKG_COMMAND_6                        (47)
+#define _EXEC_OPKG_COMMAND_7                        (48)
+#define _EXEC_OPKG_COMMAND_8                        (49)
+#define _EXEC_OPKG_COMMAND_9                        (50)
+#define _EXEC_OPKG_COMMAND_LAST                     (51)
+#define _EXEC_OPKG_COMMAND_FAILURE                  (52)
+#define _EXEC_OPKG_COMMAND_SUCCESS                  (53)
+#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (54)
+#define _DOWNLOAD_CONFIG_FILE                       (55)
+#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (56)
+#define _DOWNLOAD_CONFIG_FILE_FAILURE               (57)
+#define _DOWNLOAD_DEVICE_CONTROLLER                 (65)
 #define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (85)
 #define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (86)
 #define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE     (87)
@@ -165,7 +162,6 @@ class Worker : public QThread{
     bool m_ismasTriggerActive = false;
     bool m_updateNotNecessary = false;
     bool m_automaticUpdate = false;
-    bool m_pulledNewBranch = false;
     QStringList m_ismasTriggerStatusMessage;
 
     MainWindow *m_mainWindow;
@@ -285,9 +281,6 @@ public:
         CHECK_ISMAS_TRIGGER_FAILURE = _CHECK_ISMAS_TRIGGER_FAILURE,
         INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER = _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER,
         INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER = _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER,
-        PULL_NEW_BRANCH = _PULL_NEW_BRANCH,
-        PULL_NEW_BRANCH_FAILURE = _PULL_NEW_BRANCH_FAILURE,
-        PULL_NEW_BRANCH_SUCCESS = _PULL_NEW_BRANCH_SUCCESS,
         CHECKOUT_BRANCH = _CHECKOUT_BRANCH,
         CHECKOUT_BRANCH_SUCCESS = _CHECKOUT_BRANCH_SUCCESS,
         CHECKOUT_BRANCH_FAILURE = _CHECKOUT_BRANCH_FAILURE,
@@ -561,18 +554,6 @@ private:
         break;
         case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
         break;
-        case UPDATE_STEP::PULL_NEW_BRANCH: {
-            lst << instance->m_debugMsg;
-            Utils::printUpdateStatusMsg(debug, lst);
-        } break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_FAILURE: {
-            lst << instance->m_debugMsg;
-            Utils::printUpdateStatusMsg(debug, lst);
-        } break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS: {
-            lst << instance->m_debugMsg;
-            Utils::printUpdateStatusMsg(debug, lst);
-        } break;
         case UPDATE_STEP::CHECKOUT_BRANCH:
             lst << instance->m_debugMsg;
             Utils::printUpdateStatusMsg(debug, lst);
@@ -891,51 +872,6 @@ private:
         case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
             ismasClient.setProgressInPercent(_INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER);
         break;
-        case UPDATE_STEP::PULL_NEW_BRANCH: {
-            ismasClient.setProgressInPercent(_PULL_NEW_BRANCH);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        "U0010",
-                        _PULL_NEW_BRANCH,
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        }
-        break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_FAILURE: {
-            ismasClient.setProgressInPercent(_PULL_NEW_BRANCH_FAILURE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        "U0003",
-                        _PULL_NEW_BRANCH_FAILURE,
-                        IsmasClient::RESULT_CODE::INSTALL_ERROR,
-                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        }
-        break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS: {
-            ismasClient.setProgressInPercent(_PULL_NEW_BRANCH_SUCCESS);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        "U0010",
-                        _PULL_NEW_BRANCH_SUCCESS,
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        }
-        break;
         case UPDATE_STEP::CHECKOUT_BRANCH: {
             ismasClient.setProgressInPercent(_CHECKOUT_BRANCH);
             QString const &ismasUpdateNews =
@@ -1369,12 +1305,6 @@ private:
         break;
         case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
         break;
-        case UPDATE_STEP::PULL_NEW_BRANCH:
-        break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_FAILURE:
-        break;
-        case UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS:
-        break;
         case UPDATE_STEP::CHECKOUT_BRANCH:
             emit worker->appendText("\nPrepare customer environment ...");
         break;