diff --git a/worker.cpp b/worker.cpp index 58b1952..ed3a178 100644 --- a/worker.cpp +++ b/worker.cpp @@ -272,12 +272,11 @@ void Worker::privateUpdate() { m_ismasTriggerActive = false; m_updateNotNecessary = false; - QDateTime const ¤t = 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 + if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository + m_ismasTriggerActive = updateTriggerSet(); + if (m_ismasTriggerActive == false) { + QDateTime const ¤t = QDateTime::currentDateTime(); + m_automaticUpdate = (current.time().hour() < 4); m_versionInfo = m_gc.gitShowReason(m_branchName); qCritical() << "***"; @@ -289,8 +288,14 @@ 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() << "***"; @@ -299,6 +304,9 @@ 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") }