Compare commits
2 Commits
f346390631
...
8968667c23
Author | SHA1 | Date | |
---|---|---|---|
8968667c23 | |||
a5e0154757 |
@ -105,7 +105,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||||
# 1.4.1 : Sync files in the customer repository (under ./etc) as the very
|
# 1.4.1 : Sync files in the customer repository (under ./etc) as the very
|
||||||
# first step
|
# first step
|
||||||
VERSION="1.4.1"
|
# 1.4.2 : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
|
||||||
|
# the same after an rsync. They might be noy after a change of the
|
||||||
|
# customer-number.
|
||||||
|
VERSION="1.4.2"
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
|
@ -991,13 +991,15 @@ bool Worker::syncCustomerRepositoryAndFS() {
|
|||||||
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
||||||
QDir dir2("/etc/psa_tariff");
|
QDir dir2("/etc/psa_tariff");
|
||||||
if (Utils::sameFilesInDirs(dir1, dir2)) {
|
if (Utils::sameFilesInDirs(dir1, dir2)) {
|
||||||
|
CONSOLE() << QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
|
||||||
|
<< "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
|
||||||
|
}
|
||||||
CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
|
CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
|
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user