Skip to content

Commit 22eed95

Browse files
committed
fix: update lastore config paths to new dde namespace
1. Changed config paths from "org.deepin.lastore" to "org.deepin.dde.lastore" in both recoverydialog.cpp and updateworker.cpp 2. Updated corresponding log messages to reflect new namespace 3. This change aligns with the new DDE namespace convention for consistency across the project fix: 更新lastore配置路径到新的dde命名空间 1. 在recoverydialog.cpp和updateworker.cpp中将配置路径 从"org.deepin.lastore"改为"org.deepin.dde.lastore" 2. 更新了相应的日志消息以反映新的命名空间 3. 此更改符合项目新的DDE命名空间约定,保持一致性 pms: BUG-313665
1 parent 91b980a commit 22eed95

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/dde-abrecovery/recoverydialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,18 +263,18 @@ void RecoveryWidget::initUI()
263263
reasonLabel->setContentsMargins(QMargins(10, 0, 10, 0));
264264
QString reasonMsg;
265265
DFontSizeManager::instance()->bind(reasonLabel, DFontSizeManager::T4, QFont::DemiBold);
266-
const QString upgradeStatus = DConfigHelper::instance()->getConfig("org.deepin.lastore", "org.deepin.lastore", "","upgrade-status", 0).toString();
266+
const QString upgradeStatus = DConfigHelper::instance()->getConfig("org.deepin.dde.lastore", "org.deepin.dde.lastore", "","upgrade-status", 0).toString();
267267
QJsonParseError json_err;
268268
QJsonDocument upgradeStatusMessage = QJsonDocument::fromJson(upgradeStatus.toUtf8(), &json_err);
269269
if (json_err.error != QJsonParseError::NoError) {
270-
qWarning() << "org.deepin.lastore upgrade-status, json parse error: " << json_err.errorString();
270+
qWarning() << "org.deepin.dde.lastore upgrade-status, json parse error: " << json_err.errorString();
271271
reasonMsg = tr("Updates failed.");
272272
} else {
273273
const QJsonObject &object = upgradeStatusMessage.object();
274274
const QString status = object.value("Status").toString();
275275
const QString reasonCode = object.value("ReasonCode").toString();
276276

277-
qInfo() << "org.deepin.lastore, upgrade-status: " << status << ", reason code: " << reasonCode;
277+
qInfo() << "org.deepin.dde.lastore, upgrade-status: " << status << ", reason code: " << reasonCode;
278278

279279
// running, 代表在更新过程中被中断
280280
if (status == "running") {

src/dde-update/updateworker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ void UpdateWorker::checkStatusAfterSessionActive()
542542
return;
543543
}
544544
}
545-
const int lastoreDaemonStatus = DConfigHelper::instance()->getConfig("org.deepin.lastore", "org.deepin.lastore", "","lastore-daemon-status", 0).toInt();
545+
const int lastoreDaemonStatus = DConfigHelper::instance()->getConfig("org.deepin.dde.lastore", "org.deepin.dde.lastore", "","lastore-daemon-status", 0).toInt();
546546
qInfo() << "Lastore daemon status: " << lastoreDaemonStatus;
547547
static const int IS_UPDATE_READY = 1; // 第一位表示更新是否可用
548548
const bool isUpdateReady = lastoreDaemonStatus & IS_UPDATE_READY;

0 commit comments

Comments
 (0)