Do not use opkg_commnands-file as located in the filesystem under
/etc/psa_update anymore.
This commit is contained in:
parent
2e7d33c4c8
commit
2164037123
10
worker.cpp
10
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;
|
||||
|
Loading…
Reference in New Issue
Block a user