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

Use getShowReason() with branchName. Use getOsVersion(0 and

Browse Source 
getApismVersion().
This commit is contained in:
Gerhard Hoffmann 2023-10-09 15:54:58 +02:00
parent 355b28ba40
commit d4ee56559b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worker.cpp
View File

@ -1089,7 +1089,7 @@ PSAInstalled Worker::getPSAInstalled() {
psaInstalled.versionInfo.reason = ""; psaInstalled.versionInfo.reason = "";
psaInstalled.versionInfo.created = ""; psaInstalled.versionInfo.created = "";
QStringList versionInfo = m_gc.gitShowReason(); QStringList versionInfo = m_gc.gitShowReason(m_branchName);
if (versionInfo.size() == 3) { if (versionInfo.size() == 3) {
psaInstalled.versionInfo.lastCommit = versionInfo.at(0); psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
psaInstalled.versionInfo.reason = versionInfo.at(1); psaInstalled.versionInfo.reason = versionInfo.at(1);
@ -1111,7 +1111,7 @@ PSAInstalled Worker::getPSAInstalled() {
psaInstalled.tariff.info = "N/A"; psaInstalled.tariff.info = "N/A";
psaInstalled.tariff.version = "N/A"; psaInstalled.tariff.version = "N/A";
psaInstalled.hw.linuxVersion = m_osVersion; psaInstalled.hw.linuxVersion = getOsVersion();
psaInstalled.hw.cpuSerial = m_cpuSerial; psaInstalled.hw.cpuSerial = m_cpuSerial;
psaInstalled.opkg.blob = m_gc.gitBlob(absPathNameRepositoryOpkg); psaInstalled.opkg.blob = m_gc.gitBlob(absPathNameRepositoryOpkg);
@ -1125,7 +1125,9 @@ PSAInstalled Worker::getPSAInstalled() {
psaInstalled.dc.gitLastCommit = "N/A"; psaInstalled.dc.gitLastCommit = "N/A";
psaInstalled.dc.size = -1; psaInstalled.dc.size = -1;
psaInstalled.sw.apismVersion = m_apismVersion; if (std::optional<QString> v = getApismVersion()) {
psaInstalled.sw.apismVersion = v.value();
}
psaInstalled.sw.atbQTVersion = m_atbqtVersion; psaInstalled.sw.atbQTVersion = m_atbqtVersion;
psaInstalled.pluginVersion.deviceController = m_pluginVersionATBDeciceController; psaInstalled.pluginVersion.deviceController = m_pluginVersionATBDeciceController;