fix: cherry-pick 2 bugs of release/eagle#359
Merged
Merged
Conversation
log: Add check for empty conflict_version in isConflictSatisfy to prevent installation failures when conflict version is missing
…#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.
deepin pr auto review我来对这段代码变更进行审查：
bool isValidVersionCheck(const QString& version, Package::CompareResult result, Package::RelationType type) {
return version.isEmpty() || dependencyVersionMatch(result, type);
}
总体评价：
建议后续改进：
|
Reviewer's guide (collapsed on small PRs)Reviewer's GuideAdjusts conflict resolution logic in the Debian package manager to gracefully handle conflicts and replacements when the conflict or replacement package version is empty. Sequence diagram for updated conflict resolution when conflict_version may be emptysequenceDiagram
participant PackagesManager
participant Package
participant DependencyMatcher as DependencyVersionMatcher
PackagesManager->>Package: compareVersion(installed_version, conflict_version)
Package-->>PackagesManager: result
alt conflict_version is empty
PackagesManager->>PackagesManager: treat as non_matching_conflict
PackagesManager->>PackagesManager: package = nullptr
PackagesManager->>PackagesManager: continue to next package
else conflict_version is not empty
PackagesManager->>DependencyMatcher: dependencyVersionMatch(result, type)
alt version does not match
PackagesManager->>PackagesManager: package = nullptr
PackagesManager->>PackagesManager: continue to next package
else version matches
PackagesManager->>PackagesManager: keep package as conflicting
end
end
Sequence diagram for updated replace resolution when replace.packageVersion may be emptysequenceDiagram
participant PackagesManager
participant Package
participant Replace
participant DependencyMatcher as DependencyVersionMatcher
loop for each replace rule
PackagesManager->>Replace: relationType()
Replace-->>PackagesManager: replaceType
PackagesManager->>Replace: packageVersion()
Replace-->>PackagesManager: replaceVersion
alt replaceVersion is empty
PackagesManager->>PackagesManager: consider replace rule satisfied
PackagesManager->>PackagesManager: conflict_yes = false
else replaceVersion is not empty
PackagesManager->>Package: compareVersion(installed_version, replaceVersion)
Package-->>PackagesManager: versionCompare
PackagesManager->>DependencyMatcher: dependencyVersionMatch(versionCompare, replaceType)
alt version matches
PackagesManager->>PackagesManager: conflict_yes = false
else version does not match
PackagesManager->>PackagesManager: continue to next replace rule
end
end
end
Class diagram for updated PackagesManager conflict and replace handlingclassDiagram
class PackagesManager {
+ConflictResult isConflictSatisfy(QString arch, QString packageName, QString version)
-bool dependencyVersionMatch(int compareResult, RelationType type)
}
class Package {
+static int compareVersion(QString versionA, QString versionB)
}
class Replace {
+RelationType relationType()
+QString packageVersion()
}
class ConflictResult {
+bool conflict_yes
+QString conflictingPackageName
}
class RelationType
PackagesManager --> Package : uses
PackagesManager --> Replace : evaluates
PackagesManager --> ConflictResult : returns
PackagesManager --> RelationType : uses
Replace --> RelationType : returns
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- In both new conditions, consider documenting the intended semantics of an empty version (e.g., treating it as ‘no version constraint’) so future readers understand why
isEmpty()short-circuits the usual version comparison. - In the replace-handling block, you call
replace.packageVersion()twice; capturing this in a localconst auto &version = replace.packageVersion();would avoid duplication and make the logic slightly clearer.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In both new conditions, consider documenting the intended semantics of an empty version (e.g., treating it as ‘no version constraint’) so future readers understand why `isEmpty()` short-circuits the usual version comparison.
- In the replace-handling block, you call `replace.packageVersion()` twice; capturing this in a local `const auto &version = replace.packageVersion();` would avoid duplication and make the logic slightly clearer.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
lzwind
approved these changes
Dec 18, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: LiHua000, lzwind The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/merge |
Contributor
|
This pr cannot be merged! (status: unstable) |
Contributor
Author
|
/merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix: handle empty package version in conflict resolution
fix: empty value check (#348)
Summary by Sourcery
Handle package conflict and replacement rules correctly when the conflicting or replacement package version is unspecified.
Bug Fixes: