Skip to content

Fixes: #491: correct add_changelog_entry(): Incorrect evr expansion #492

Merged
softwarefactory-project-zuul[bot] merged 1 commit intopackit:mainfrom
jessp01:better-evr-detection
Oct 6, 2025
Merged

Fixes: #491: correct add_changelog_entry(): Incorrect evr expansion #492
softwarefactory-project-zuul[bot] merged 1 commit intopackit:mainfrom
jessp01:better-evr-detection

Conversation

@jessp01
Copy link
Contributor

@jessp01 jessp01 commented Sep 16, 2025

Address #491: add_changelog_entry(): Incorrect evr expansion

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @jessp01, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug in the add_changelog_entry function within the specfile library. Previously, the Epoch-Version-Release (EVR) string was not being expanded correctly, leading to malformed changelog entries. The changes ensure that the EVR is now accurately constructed, improving the reliability and correctness of changelog generation.

Highlights

  • Fix EVR Expansion: The add_changelog_entry function now correctly constructs the Epoch-Version-Release (EVR) string by directly using self.expanded_epoch, self.expanded_version, and self.expanded_release instead of relying on a generic self.expand method. This resolves an issue where EVR was being expanded incorrectly, as reported in issue #491.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request aims to fix an incorrect EVR expansion in add_changelog_entry(). While the new method of constructing the EVR string is correct for the default case, the change introduces a critical regression by unconditionally overwriting the evr parameter. This means that if a user provides a custom evr, it will be ignored. My review includes a suggestion to fix this regression by applying the new logic only when the default EVR is being used, and preserving the previous behavior for user-provided evr values.

@softwarefactory-project-zuul
Copy link
Contributor

@softwarefactory-project-zuul
Copy link
Contributor

@jessp01 jessp01 marked this pull request as draft September 16, 2025 12:40
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://softwarefactory-project.io/zuul/t/packit-service/buildset/fce1fe12591e488cbb8464c9046c13ca

✔️ pre-commit SUCCESS in 2m 11s
✔️ specfile-tests-rpm-deps SUCCESS in 2m 00s
✔️ specfile-tests-pip-deps SUCCESS in 2m 02s

@jessp01 jessp01 marked this pull request as ready for review September 16, 2025 14:38
Copy link
Member

@nforro nforro left a comment

Choose a reason for hiding this comment

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

Thanks. I wonder if we shouldn't disable using macros in evr at all, considering this issue (however rare).

@nforro
Copy link
Member

nforro commented Oct 6, 2025

Could you please rebase and squash the commits into one?

@nforro
Copy link
Member

nforro commented Oct 6, 2025

Also, you need to use Fixes: #491 for the issue to be automatically closed after merging.

@jessp01 jessp01 changed the title Fix add_changelog_entry(): Incorrect evr expansion Fixes: #491: correct add_changelog_entry(): Incorrect evr expansion Oct 6, 2025
@softwarefactory-project-zuul
Copy link
Contributor

@jessp01 jessp01 force-pushed the better-evr-detection branch from e3e7e01 to 37eedcc Compare October 6, 2025 19:07
@softwarefactory-project-zuul
Copy link
Contributor

@softwarefactory-project-zuul
Copy link
Contributor

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://softwarefactory-project.io/zuul/t/packit-service/buildset/a5d36f4f2c294a319eb05cf1f6725b33

✔️ pre-commit SUCCESS in 1m 54s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 47s
✔️ specfile-tests-pip-deps SUCCESS in 1m 44s

add_changelog_entry(): Incorrect evr expansion
Use the tags() context manager directly for better performance

Co-authored-by: Nikola Forró <[email protected]>
@jessp01 jessp01 force-pushed the better-evr-detection branch from f2306bb to 05acf46 Compare October 6, 2025 20:16
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://softwarefactory-project.io/zuul/t/packit-service/buildset/b3c1a57d444b4b39bdd41364a399587f

✔️ pre-commit SUCCESS in 1m 56s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 47s
✔️ specfile-tests-pip-deps SUCCESS in 1m 44s

@nforro nforro added the mergeit Merge via Zuul label Oct 6, 2025
@nforro nforro linked an issue Oct 6, 2025 that may be closed by this pull request
2 tasks
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).
https://softwarefactory-project.io/zuul/t/packit-service/buildset/d771a37a425b41e3825f452f2b9fc29c

✔️ pre-commit SUCCESS in 1m 58s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 87d0521 into packit:main Oct 6, 2025
47 of 49 checks passed
@github-project-automation github-project-automation bot moved this from new to done in Packit Kanban Board Oct 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mergeit Merge via Zuul

Projects

No open projects
Archived in project

Development

Successfully merging this pull request may close these issues.

add_changelog_entry(): Incorrect evr expansion

3 participants