diff --git a/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro b/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro index 7c76fb1..9e7e8dc 100644 --- a/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro +++ b/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro @@ -141,7 +141,10 @@ DEFINES += QT_DEPRECATED_WARNINGS # 1.5.1 : Fix: do not use cleanPath() on a url-address. # 1.5.2 : Remove .ipk and .gz files in /var/cache/opkg. # 1.5.3 : Build customer_(id) name without right justification. -VERSION="1.5.3" +# 1.5.4 : Try to run opkg-commands even under some error conditions (failure +# of customerEnvironment(), filesToUpdate() or +# syncCustomerRepositoryAndFS(). +VERSION="1.5.4" # PLANNED TODOS: # 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT. # 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu diff --git a/UpdatePTUDevCtrl/ismas/ismas_client.cpp b/UpdatePTUDevCtrl/ismas/ismas_client.cpp index 2d94554..bc61a55 100644 --- a/UpdatePTUDevCtrl/ismas/ismas_client.cpp +++ b/UpdatePTUDevCtrl/ismas/ismas_client.cpp @@ -690,7 +690,8 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) { "\"libTCP_ZVT_CCPlugin.so\" : {" "\"VERSION\" : \"%s\"" "}" - "}" + "}," + "\"PTU-PACKAGE-VERSIONS\" : %s" "}", psa.versionInfo.reason.toStdString().c_str(), psa.versionInfo.created.toStdString().c_str(), @@ -801,9 +802,11 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) { psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(), psa.pluginVersion.prmCalculatePrice.toStdString().c_str(), psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(), - psa.pluginVersion.tcpZVT.toStdString().c_str()); + psa.pluginVersion.tcpZVT.toStdString().c_str(), - qInfo() << buf; + psa.ptuPackageVersion.toStdString().c_str()); + + qInfo() << buf; return buf; } diff --git a/UpdatePTUDevCtrl/ismas/ismas_client.h b/UpdatePTUDevCtrl/ismas/ismas_client.h index bff1f03..31c73d0 100644 --- a/UpdatePTUDevCtrl/ismas/ismas_client.h +++ b/UpdatePTUDevCtrl/ismas/ismas_client.h @@ -77,6 +77,8 @@ struct PSAInstalled { DC2C print[32]; + QString ptuPackageVersion; + explicit PSAInstalled() { tariff.name = "N/A"; tariff.version = "N/A";