Fixed missing git pull command.
Fixed missing update for text-edit when only clone the customer repository.
This commit is contained in:
parent
6a4a852fd6
commit
0b7d504a7a
14
worker.cpp
14
worker.cpp
@ -141,6 +141,14 @@ void Worker::privateUpdate() {
|
|||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
m_ismasClient.updateOfPSASucceeded(""));
|
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 {
|
} else {
|
||||||
// checkout branch
|
// checkout branch
|
||||||
@ -203,6 +211,9 @@ void Worker::privateUpdate() {
|
|||||||
if (!sentIsmasLastVersionNotification) {
|
if (!sentIsmasLastVersionNotification) {
|
||||||
// try even if the backend is not connected
|
// try even if the backend is not connected
|
||||||
sendIsmasLastVersionNotification();
|
sendIsmasLastVersionNotification();
|
||||||
|
emit setProgress(100);
|
||||||
|
m_ismasClient.setProgressInPercent(100);
|
||||||
|
emit appendText(QString(""), UPDATE_STEP_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_updateProcessRunning = false;
|
m_updateProcessRunning = false;
|
||||||
@ -418,6 +429,9 @@ bool Worker::filesToUpdate() {
|
|||||||
} else {
|
} else {
|
||||||
emit appendText(QString("\nFound 1 file to update "), UPDATE_STEP_DONE);
|
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;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
emit showErrorMessage("files to update", "no files to update (checked-in any files?)");
|
emit showErrorMessage("files to update", "no files to update (checked-in any files?)");
|
||||||
|
Loading…
Reference in New Issue
Block a user