Skip to content

Fixing package name with numeric issue in top level package resolving#456

Merged
yockgen merged 3 commits intomainfrom
pg-dev-fix-rpm-version
Mar 4, 2026
Merged

Fixing package name with numeric issue in top level package resolving#456
yockgen merged 3 commits intomainfrom
pg-dev-fix-rpm-version

Conversation

@yockgen
Copy link
Copy Markdown
Contributor

@yockgen yockgen commented Mar 2, 2026

Merge Checklist

All boxes should be checked before merging the PR

  • [X ] The changes in the PR have been built and tested
  • Documentation has been updated to reflect the changes (or no doc update needed)
  • [X ] Ready to merge

Description

Fixing package name with numeric issue in top level package resolving, currently, if the requested package name in template containing numeric, for example, "ntfs-3g", will be recognized as "ntfs", which is incorrect.

Any Newly Introduced Dependencies

How Has This Been Tested?

image

Signed-off-by: Mah, Yock Gen <yock.gen.mah@intel.com>
Copilot AI review requested due to automatic review settings March 2, 2026 02:46
@yockgen yockgen requested a review from a team as a code owner March 2, 2026 02:46
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR addresses RPM top-level package resolution for package names that contain numeric segments (e.g., ntfs-3g), by preferring the canonical RPM package name field instead of deriving the name from the RPM filename.

Changes:

  • Update ResolveTopPackageConflicts to use PackageInfo.PkgName when matching requested package names, falling back to filename-based extraction when PkgName is empty.

Comment thread internal/ospackage/rpmutils/helper.go
Comment thread internal/ospackage/rpmutils/helper.go
Copy link
Copy Markdown
Contributor

@arodage arodage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Contributor

@magerstam magerstam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@yockgen yockgen merged commit d18e422 into main Mar 4, 2026
34 checks passed
@yockgen yockgen deleted the pg-dev-fix-rpm-version branch March 4, 2026 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants