OnDemandUpdatePTU.pro

@@ -95,11 +95,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
 #           Set hash-value in EVENT-objects. Set location (project), version
 #           and info in send-last-version.
-#           If the customer repository does not exist, then do not check the
-#           ISMAS trigger, but proceed with the update procedure. Otherwise,
-#           check the ISMAS update-trigger as first step.
+#           Check the ISMAS update-trigger as very first step.
 #           If the current time is between 0.00 - 4.00 o'clock, then a wrong
-#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
+#           trigger-value wil result in an UPDATE_STEP_NOT_NECESSARY.
 #           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).

worker.cpp

@@ -272,11 +272,12 @@ void Worker::privateUpdate() {
     m_ismasTriggerActive = false;
     m_updateNotNecessary = false;
 
-    if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
-        m_ismasTriggerActive = updateTriggerSet();
-        if (m_ismasTriggerActive == false) {
-            QDateTime const &current = QDateTime::currentDateTime();
-            m_automaticUpdate = (current.time().hour() < 4);
+    QDateTime const &current = QDateTime::currentDateTime();
+    m_automaticUpdate = (current.time().hour() < 4);
+
+    m_ismasTriggerActive = updateTriggerSet();
+    if (m_ismasTriggerActive == false) {
+        if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
             m_versionInfo = m_gc.gitShowReason(m_branchName);
 
             qCritical() << "***";
@@ -288,14 +289,8 @@ void Worker::privateUpdate() {
                 m_ismasTriggerStatusMessage = QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
 
                 qCritical() << "privateUpdate m_ismasTriggerStatusMessage:" << QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
-                qCritical() << "***";
-
-                // the customer-repository does exist, but the ISMAS-trigger is
-                // *NOT* "WAIT", but from 00:00:00 - 00:03:59 this counts as an
-                // automatic update
 
                 m_lastFailedUpdateStep = UPDATE_STEP::NONE;
-                return;
             }
 
             qCritical() << "***";
@@ -304,9 +299,6 @@ void Worker::privateUpdate() {
             // *NOT* "WAIT", so STOP the update procedure
             return;
         }
-        // the customer-repository does exist, and the ISMAS-trigger is "WAIT",
-        // so continue the update procedure
-    } else {
         // the customer-repository does not exist, so PROCEED with the
         // update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
     }