Skip to content

Commit 11ba727

Browse files
fix: Support 2-part OsBuild format for UOS edition detection
- Updated OsBuild format validation to accept both 2-part and 3-part formats. This change improves compatibility with different UOS version string formats. Log: Fix UOS edition type detection failure when OsBuild has only 2 parts. Bug: fix: Support 2-part OsBuild format for UOS edition detection - Updated OsBuild format validation to accept both 2-part and 3-part formats. This change improves compatibility with different UOS version string formats. Log: Fix UOS edition type detection failure when OsBuild has only 2 parts. Bug: https://pms.uniontech.com/bug-view-339355.html
1 parent 4263035 commit 11ba727

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/base/utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ Dtk::Core::DSysInfo::UosEdition Utils::uosEditionType()
530530

531531
QStringList parts = buildType.split(".");
532532
qCDebug(app) << "OsBuild parts:" << parts;
533-
if(parts.size() != 3) {
534-
qCDebug(app) << "Invalid OsBuild format, expected 3 parts";
533+
if(parts.size() != 3 && parts.size() != 2 ) {
534+
qCDebug(app) << "Invalid OsBuild format, expected 2 or 3 parts";
535535
hasQueried = true;
536536
return cachedEdition;
537537
}

src/view/manual_proxy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ QString ManualProxy::appToPath(const QString &appName)
272272
}
273273
}
274274
if (ret.isEmpty()) {
275-
qCWarning(app) << " no exist file:" << appName;
275+
qCWarning(app) << " no exist file: " << ret ;
276276
// TODO(wurongjie) 在之前的代码中返回了error,暂不知作用
277277
return "error";
278278
}

0 commit comments

Comments
 (0)