GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: set m_pulledNewBranch = false in case no new branch has to be fetched from remote repository.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2024-04-29 14:59:10 +02:00
parent adaa12395e
commit f15cc636c6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UpdatePTUDevCtrl/worker.cpp
View File

@ -736,29 +736,28 @@ bool Worker::customerEnvironment() {
if (QDir(m_customerRepository).exists()) { if (QDir(m_customerRepository).exists()) {
if (m_clone == false) { if (m_clone == false) {
if (m_gc.branchExistsRemotely()) { if (m_gc.branchExistsRemotely()) {
QString msg("PULL NEW BRANCH " + m_branchName); QString msg;
QStringList lst(msg); QStringList lst;
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH));
if (!m_gc.branchExistsLocally()) { if (!m_gc.branchExistsLocally()) {
lst.clear();
msg = QString("PULLING OF NEW BRANCH " + m_branchName + " DOES NOT EXIST LOCALLY"); msg = QString("PULLING OF NEW BRANCH " + m_branchName + " DOES NOT EXIST LOCALLY");
QStringList lst(msg); lst << msg;
CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH; CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH;
if (!m_gc.gitPullNewBranches()) { if (!m_gc.gitPullNewBranches()) {
lst.clear();
msg = QString("PULLING OF NEW BRANCH " + m_branchName + " FAILED"); msg = QString("PULLING OF NEW BRANCH " + m_branchName + " FAILED");
QStringList lst(msg); lst << msg;
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_FAILURE))); ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_FAILURE)));
return false; return false;
} else { } else {
lst.clear();
msg = QString("PULLING OF NEW BRANCH " + m_branchName + " SUCCESS"); msg = QString("PULLING OF NEW BRANCH " + m_branchName + " SUCCESS");
QStringList lst(msg); lst << msg;
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS))); ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
m_pulledNewBranch = true; m_pulledNewBranch = true;
} }
} else { } else {
msg = QString("PULLING ALREADY EXISTING LOCAL BRANCH " + m_branchName + "SUCCESS"); m_pulledNewBranch = false;
QStringList lst(msg);
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
m_pulledNewBranch = true;
} }
} }
} }