Send additional messages to ISMAS about recovering the customer-repository
This commit is contained in:
parent
6b3ebde2b5
commit
8da6443833
14
worker.cpp
14
worker.cpp
@ -286,14 +286,14 @@ void Worker::privateUpdate() {
|
||||
// *NOT* "WAIT", so STOP the update procedure
|
||||
return;
|
||||
}
|
||||
// in case 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")
|
||||
}
|
||||
|
||||
QDir customerRepository(m_customerRepository);
|
||||
QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
|
||||
|
||||
CONSOLE() << UPDATE_STEP::CHECK_SANITY;
|
||||
CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY);
|
||||
|
||||
m_clone = false;
|
||||
m_repairClone = false;
|
||||
@ -316,22 +316,22 @@ void Worker::privateUpdate() {
|
||||
|
||||
if (isRepositoryCorrupted()) { // a not-existing repository is not meant
|
||||
// to be corrupted
|
||||
CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_SANITY_FAILURE);
|
||||
CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_FAILURE);
|
||||
if ((continueUpdate = repairCorruptedRepository()) == true) {
|
||||
m_repairClone = true;
|
||||
CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS;
|
||||
CONSOLE() << (ISMAS() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS);
|
||||
} else {
|
||||
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE)));
|
||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
CONSOLE() << UPDATE_STEP::CHECK_SANITY_SUCCESS;
|
||||
CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_SUCCESS);
|
||||
|
||||
if (continueUpdate) {
|
||||
if ((continueUpdate = customerRepository.exists()) == false) {
|
||||
m_initialClone = (m_repairClone == false);
|
||||
GUI() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY);
|
||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY));
|
||||
for (int i = 0; i < 5; ++i) { // try to checkout git repository
|
||||
setProgress(i); // and switch to branch
|
||||
if (m_gc.gitCloneAndCheckoutBranch()) {
|
||||
|
Loading…
Reference in New Issue
Block a user