Fix #4684: Include release field in RPM package version #4688
+6,852
−6,833
Conversation
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
Modified rpm_installed.py to combine version and release fields: - Added handlers for Epoch and Release tags - Implemented version-release-epoch combining logic inline - Matches EVR.to_string() behavior from rpm.py - Updated 9 test expected files with full version strings All 85 RPM tests passing. No circular imports introduced. Fixes aboutcode-org#4684 Signed-off-by: NullPointer-cell <[email protected]>
Author
|
@pombredanne sir |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem
RPM packages were showing incomplete version strings. The release field was being dropped, causing versions like
4.4.20-4.el8_6to appear as just4.4.20.Solution
Modified
rpm_installed.pyto capture and combine the version and release fields using the same logic asEVR.to_string()inrpm.py.Changes
EpochandReleaseRPM tagsTesting
Example
Before:
pkg:rpm/[email protected]?arch=x86_64After:
pkg:rpm/[email protected]_6?arch=x86_64Fixes #4684
Tasks
Reviewed contribution guidelines
PR is descriptively titled and links the original issue above
Tests pass -- look for a green checkbox (All 85 RPM tests passing locally)
Commits are in uniquely-named feature branch and has no merge conflicts
Updated documentation pages (not applicable - internal implementation change)
Updated CHANGELOG.rst (not applicable - bug fix, maintainers will update)