Compare commits
3 Commits
630cd36f13
...
korneuburg
| Author | SHA1 | Date | |
|---|---|---|---|
| 7578746d2f | |||
| 0b1ed62df1 | |||
| 76ec41c291 |
@@ -95,9 +95,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.4.0 : Start with version at 1.4.0 (mainly to see a difference with Szeged)
|
# 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
|
# Set hash-value in EVENT-objects. Set location (project), version
|
||||||
# and info in send-last-version.
|
# and info in send-last-version.
|
||||||
# Check the ISMAS update-trigger as very first step.
|
# 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.
|
||||||
# If the current time is between 0.00 - 4.00 o'clock, then a wrong
|
# If the current time is between 0.00 - 4.00 o'clock, then a wrong
|
||||||
# trigger-value wil result in an UPDATE_STEP_NOT_NECESSARY.
|
# trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
|
||||||
# Move final processing to subclass UpdateProcessRunning.
|
# Move final processing to subclass UpdateProcessRunning.
|
||||||
# Disable EXIT-button for the whole update-process, except for the
|
# Disable EXIT-button for the whole update-process, except for the
|
||||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||||
|
|||||||
20
update.cpp
20
update.cpp
@@ -605,19 +605,19 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
|
|
||||||
// CONSOLE()
|
// CONSOLE()
|
||||||
|
|
||||||
m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
// m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
||||||
QThread::sleep(1); // wait to be sure that there are no more
|
// QThread::sleep(1); // wait to be sure that there are no more
|
||||||
// commands sent to dc-hardware
|
// // commands sent to dc-hardware
|
||||||
|
|
||||||
if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
|
|
||||||
|
|
||||||
|
// if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
|
||||||
|
//
|
||||||
// qCritical() << "downloaded binary" << fToWorkOn;
|
// qCritical() << "downloaded binary" << fToWorkOn;
|
||||||
|
|
||||||
++displayIndex;
|
// ++displayIndex;
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
|
// emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
// + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
Worker::UPDATE_STEP_DONE);
|
// Worker::UPDATE_STEP_DONE);
|
||||||
}
|
//}
|
||||||
|
|
||||||
m_hw->dc_autoRequest(true); // turn auto-request setting on
|
m_hw->dc_autoRequest(true); // turn auto-request setting on
|
||||||
|
|
||||||
|
|||||||
20
worker.cpp
20
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();
|
||||||
|
if (m_ismasTriggerActive == false) {
|
||||||
m_ismasTriggerActive = updateTriggerSet();
|
QDateTime const ¤t = QDateTime::currentDateTime();
|
||||||
if (m_ismasTriggerActive == false) {
|
m_automaticUpdate = (current.time().hour() < 4);
|
||||||
if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
|
|
||||||
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")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user