Skip to content

Commit c97f7a2

Browse files
LiHua000deepin-bot[bot]
authored andcommitted
fix: handle empty package version in conflict resolution (#346)
- Add check for empty package version in replace logic - Fix potential issue when replace.packageVersion() is empty - Improve conflict resolution reliability When checking if a package can replace a conflicting package, the code now properly handles cases where the replace version is empty, preventing potential comparison issues.
1 parent b018e9c commit c97f7a2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/deb-installer/manager/packagesmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ const ConflictResult PackagesManager::isConflictSatisfy(const QString &arch,
658658
auto replaceType = replace.relationType(); // 提取版本号规则
659659
auto versionCompare =
660660
Package::compareVersion(installed_version, replace.packageVersion()); // 比较版本号
661-
if (dependencyVersionMatch(versionCompare, replaceType)) { // 如果版本号符合要求,即判定replace成立
661+
if (replace.packageVersion().isEmpty() || dependencyVersionMatch(versionCompare, replaceType)) { // 如果版本号符合要求,即判定replace成立
662662
conflict_yes = false;
663663
break;
664664
}

0 commit comments

Comments
 (0)