If we have pull a new remote branch, the behave as if the customer-repo
did not exist before: especially download all json-files inside the new local branch.
This commit is contained in:
parent
763647c145
commit
20681b0d6c
@ -780,7 +780,7 @@ bool Worker::filesToUpdate() {
|
||||
// always execute contents of opkg_commands-file
|
||||
m_filesToUpdate << "etc/psa_update/opkg_commands";
|
||||
|
||||
if (m_clone && m_alwaysDownloadConfig) {
|
||||
if ((m_clone || m_pulledNewBranch) && m_alwaysDownloadConfig) {
|
||||
// always download all json-config files, even if none of them have been
|
||||
// changed in the git repository. useful for first installation.
|
||||
QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
|
||||
@ -794,7 +794,7 @@ bool Worker::filesToUpdate() {
|
||||
}
|
||||
}
|
||||
|
||||
if (m_clone && m_alwaysDownloadDC) {
|
||||
if ((m_clone || m_pulledNewBranch) && m_alwaysDownloadConfig) {
|
||||
// always download the last dc-binary, even if not changed in the
|
||||
// git repository. useful for first installation.
|
||||
QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/dc"));
|
||||
|
Loading…
Reference in New Issue
Block a user