Compare commits
No commits in common. "e87456f26b2580aeadcd934383efb612d950092d" and "b06f4f46bbebfcf884932f9c921f562b4e36640b" have entirely different histories.
e87456f26b
...
b06f4f46bb
@ -64,8 +64,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# given in ATBUpdateTool.ini can be overwritten on the command-line.
|
||||
# 1.3.18: Bug fixes found during testing.
|
||||
# 1.3.19: Bug fixes found during testing.
|
||||
VERSION="1.3.20"
|
||||
# 1.3.20: Bug fixes found during testing.
|
||||
VERSION="1.3.21"
|
||||
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
@ -96,9 +96,6 @@ VERSION="1.3.21"
|
||||
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
||||
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
||||
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
||||
# 10: Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
|
||||
# Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
|
||||
# zwar auch ohne WAIT-Button.
|
||||
|
||||
|
||||
win32 {
|
||||
|
@ -727,7 +727,7 @@ bool Worker::execOpkgCommands() {
|
||||
if (f.open(QIODevice::ReadOnly)) {
|
||||
QTextStream in(&f);
|
||||
m_opkgCommands.clear();
|
||||
QStringList opkgErrorLst;
|
||||
bool executeOpkgCommandFailed = false;
|
||||
while (!in.atEnd()) {
|
||||
QString line = in.readLine();
|
||||
static const QRegularExpression comment("^\\s*#.*$");
|
||||
@ -735,7 +735,7 @@ bool Worker::execOpkgCommands() {
|
||||
// found opkg command
|
||||
QString opkgCommand = line.trimmed();
|
||||
if (!executeOpkgCommand(opkgCommand)) {
|
||||
opkgErrorLst << opkgCommand;
|
||||
executeOpkgCommandFailed = true;
|
||||
} else {
|
||||
QString cmd = "\n " + opkgCommand;
|
||||
emit appendText(cmd);
|
||||
@ -789,15 +789,14 @@ bool Worker::execOpkgCommands() {
|
||||
}
|
||||
}
|
||||
f.close();
|
||||
if (opkgErrorLst.size() == 0) {
|
||||
if (!executeOpkgCommandFailed) {
|
||||
if (m_opkgCommands.size() > 0) {
|
||||
m_displayIndex = 1;
|
||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS));
|
||||
GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS;
|
||||
setProgress(_EXEC_OPKG_COMMAND_SUCCESS);
|
||||
}
|
||||
} else {
|
||||
m_displayIndex = 1;
|
||||
ISMAS(opkgErrorLst) << (GUI(opkgErrorLst) << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE));
|
||||
GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE;
|
||||
setProgress(_EXEC_OPKG_COMMAND_FAILURE);
|
||||
return false;
|
||||
|
6
worker.h
6
worker.h
@ -557,10 +557,8 @@ private:
|
||||
break;
|
||||
case UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS:
|
||||
break;
|
||||
case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE: {
|
||||
lst << instance->m_debugMsg;
|
||||
Utils::printUpdateStatusMsg(debug, lst);
|
||||
} break;
|
||||
case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE:
|
||||
break;
|
||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE:
|
||||
break;
|
||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS:
|
||||
|
Loading…
x
Reference in New Issue
Block a user