From 0b7d504a7acc034139e7e292c3483284998d3191 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 2 Aug 2023 16:53:19 +0200 Subject: [PATCH] Fixed missing git pull command. Fixed missing update for text-edit when only clone the customer repository. --- worker.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/worker.cpp b/worker.cpp index 7dc06f0..68531ce 100644 --- a/worker.cpp +++ b/worker.cpp @@ -141,6 +141,14 @@ void Worker::privateUpdate() { QString("#M=APISM#C=CMD_EVENT#J=") + m_ismasClient.updateOfPSASucceeded("")); + emit setProgress(95); + m_ismasClient.setProgressInPercent(95); + IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT, + QString("#M=APISM#C=CMD_EVENT#J=") + m_ismasClient.updateOfPSAActivated()); + + //emit setProgress(100); + //m_ismasClient.setProgressInPercent(100); + //emit appendText(QString(""), UPDATE_STEP_SUCCESS); } } else { // checkout branch @@ -203,6 +211,9 @@ void Worker::privateUpdate() { if (!sentIsmasLastVersionNotification) { // try even if the backend is not connected sendIsmasLastVersionNotification(); + emit setProgress(100); + m_ismasClient.setProgressInPercent(100); + emit appendText(QString(""), UPDATE_STEP_SUCCESS); } m_updateProcessRunning = false; @@ -418,6 +429,9 @@ bool Worker::filesToUpdate() { } else { emit appendText(QString("\nFound 1 file to update "), UPDATE_STEP_DONE); } + if (!m_gc.gitPull()) { + emit showErrorMessage("files to update", "pulling files failed"); + } return true; } else { emit showErrorMessage("files to update", "no files to update (checked-in any files?)");