From 21640371236bf37333383d74d29043de0ccaebd8 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Fri, 6 Oct 2023 10:42:35 +0200
Subject: [PATCH] Do not use opkg_commnands-file as located in the filesystem
 under /etc/psa_update anymore.

---
 worker.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/worker.cpp b/worker.cpp
index b9559aa..03e7a9f 100644
--- a/worker.cpp
+++ b/worker.cpp
@@ -868,7 +868,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
         if (QDir::setCurrent(m_customerRepository)) {
             Command md("bash");
             if (!md.execute(m_customerRepository,
-                            QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/psa_update /etc/dc /etc/psa_tariff")) {
+                            QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
                 qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
             }
             int progress = 10;
@@ -1067,9 +1067,7 @@ PSAInstalled Worker::getPSAInstalled() {
     QString printSysDir("/etc/psa_config");
     QString tariffSysDir("/etc/psa_tariff");
     QString tariffRepoDir("etc/psa_tariff");
-    QString opkgSysDir("/etc/psa_update");
     QString opkgRepoDir("etc/psa_update");
-    QString const &absPathNameOpkg = QDir::cleanPath(opkgSysDir + QDir::separator() + "opkg_commands");
     QString const &absPathNameRepositoryOpkg = QDir::cleanPath(opkgRepoDir + QDir::separator() + "opkg_commands");
     QString absPathName;
     QString absPathNameRepository;
@@ -1103,9 +1101,9 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.hw.linuxVersion = m_osVersion;
     psaInstalled.hw.cpuSerial = m_cpuSerial;
 
-    psaInstalled.opkg.blob = m_gc.gitBlob(absPathNameOpkg);
-    psaInstalled.opkg.size = getFileSize(absPathNameOpkg);
-    psaInstalled.opkg.loadTime = Utils::getTariffLoadTime(absPathNameOpkg);
+    psaInstalled.opkg.blob = m_gc.gitBlob(absPathNameRepositoryOpkg);
+    psaInstalled.opkg.size = getFileSize(absPathNameRepositoryOpkg);
+    psaInstalled.opkg.loadTime = Utils::getTariffLoadTime(absPathNameRepositoryOpkg);
     psaInstalled.opkg.lastCommit = m_gc.gitLastCommit(absPathNameRepositoryOpkg);
 
     psaInstalled.dc.versionHW = deviceControllerVersionHW;