Optimization: if customer repository does not exist, do noy check the
ISMAS trigger, but proceed with the update procedure.
This commit is contained in:
parent
76ec41c291
commit
0b1ed62df1
16
worker.cpp
16
worker.cpp
@ -272,12 +272,11 @@ void Worker::privateUpdate() {
|
|||||||
m_ismasTriggerActive = false;
|
m_ismasTriggerActive = false;
|
||||||
m_updateNotNecessary = false;
|
m_updateNotNecessary = false;
|
||||||
|
|
||||||
QDateTime const ¤t = QDateTime::currentDateTime();
|
if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
|
||||||
m_automaticUpdate = (current.time().hour() < 4);
|
|
||||||
|
|
||||||
m_ismasTriggerActive = updateTriggerSet();
|
m_ismasTriggerActive = updateTriggerSet();
|
||||||
if (m_ismasTriggerActive == false) {
|
if (m_ismasTriggerActive == false) {
|
||||||
if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
|
QDateTime const ¤t = QDateTime::currentDateTime();
|
||||||
|
m_automaticUpdate = (current.time().hour() < 4);
|
||||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||||
|
|
||||||
qCritical() << "***";
|
qCritical() << "***";
|
||||||
@ -289,8 +288,14 @@ void Worker::privateUpdate() {
|
|||||||
m_ismasTriggerStatusMessage = QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
|
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() << "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;
|
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
qCritical() << "***";
|
qCritical() << "***";
|
||||||
@ -299,6 +304,9 @@ void Worker::privateUpdate() {
|
|||||||
// *NOT* "WAIT", so STOP the update procedure
|
// *NOT* "WAIT", so STOP the update procedure
|
||||||
return;
|
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
|
// the customer-repository does not exist, so PROCEED with the
|
||||||
// update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
|
// update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user