Compare commits
No commits in common. "100bfd63ab070ca4cc5d5a869a70c482ce20d795" and "8da6443833e5038f1508799fb7c1a93137cf4cb0" have entirely different histories.
100bfd63ab
...
8da6443833
@ -290,8 +290,6 @@ void Worker::privateUpdate() {
|
|||||||
// update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
|
// update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
|
||||||
}
|
}
|
||||||
|
|
||||||
emit this->disableExit();
|
|
||||||
|
|
||||||
QDir customerRepository(m_customerRepository);
|
QDir customerRepository(m_customerRepository);
|
||||||
QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
|
QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
|
||||||
|
|
||||||
@ -378,6 +376,7 @@ void Worker::privateUpdate() {
|
|||||||
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
|
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
|
||||||
setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
|
setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
|
||||||
|
|
||||||
|
|
||||||
if (m_clone == false) {
|
if (m_clone == false) {
|
||||||
if (m_ismasTriggerActive == false) {
|
if (m_ismasTriggerActive == false) {
|
||||||
return;
|
return;
|
||||||
@ -613,7 +612,7 @@ bool Worker::updateTriggerSet() {
|
|||||||
// if the customer repository has just been cloned
|
// if the customer repository has just been cloned
|
||||||
return false; // it is OK the ISMAS trigger might not be 'WAIT'
|
return false; // it is OK the ISMAS trigger might not be 'WAIT'
|
||||||
} else {
|
} else {
|
||||||
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE));
|
||||||
}
|
}
|
||||||
QThread::sleep(6);
|
QThread::sleep(6);
|
||||||
continue;
|
continue;
|
||||||
@ -651,7 +650,7 @@ bool Worker::updateTriggerSet() {
|
|||||||
} else {
|
} else {
|
||||||
m_ismasTriggerStatusMessage = QStringList(QString("no ISMAS response (LINE=%1)").arg(__LINE__));
|
m_ismasTriggerStatusMessage = QStringList(QString("no ISMAS response (LINE=%1)").arg(__LINE__));
|
||||||
QStringList lst = m_ismasTriggerStatusMessage;
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE));
|
||||||
QThread::sleep(6);
|
QThread::sleep(6);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user