Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accept any number of whitespaces when parsing %changelog entry timestamp #81

Merged
merged 2 commits into from
Aug 10, 2022
Merged

Accept any number of whitespaces when parsing %changelog entry timestamp #81

merged 2 commits into from
Aug 10, 2022

Conversation

nforro
Copy link
Member

@nforro nforro commented Aug 9, 2022

Fixes #80.

@nforro nforro force-pushed the changelog-timestamps branch from b8ae9af to 9b6c05f Compare August 9, 2022 10:18
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

✔️ pre-commit SUCCESS in 2m 28s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 19s
❌ specfile-tests-pip-deps MERGE_CONFLICT in 1s

@nforro
Copy link
Member Author

nforro commented Aug 9, 2022

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ pre-commit SUCCESS in 2m 25s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 48s
✔️ specfile-tests-pip-deps SUCCESS in 1m 53s

@nforro
Copy link
Member Author

nforro commented Aug 9, 2022

Actually, I'm thinking reversing the logic to fallback to the old timestamp format if parsing fails would be safer.

@nforro
Copy link
Member Author

nforro commented Aug 9, 2022

@lachmanfrantisek could you have another look? I've added commit 82cf6ad.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ pre-commit SUCCESS in 1m 38s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 03s
✔️ specfile-tests-pip-deps SUCCESS in 1m 04s

nforro added 2 commits August 10, 2022 11:14
@nforro
Accept any number of whitespaces when parsing %changelog entry timestamp
45ef4ba 
Signed-off-by: Nikola Forró <nforro@redhat.com>
@nforro
Reverse the logic of detecting extended timestamp format
bda8de3 
Try to match the extended timestamp format rather than the classic one,
so that if there is no match, the format is considered to be classic.

Signed-off-by: Nikola Forró <nforro@redhat.com>
@nforro nforro force-pushed the changelog-timestamps branch from 82cf6ad to bda8de3 Compare August 10, 2022 09:14
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ pre-commit SUCCESS in 1m 43s
✔️ specfile-tests-rpm-deps SUCCESS in 1m 20s
✔️ specfile-tests-pip-deps SUCCESS in 1m 25s

@nforro nforro added the mergeit Zuul, merge it! label Aug 10, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

✔️ pre-commit SUCCESS in 1m 46s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit a5e6fdf into main Aug 10, 2022
@delete-merged-branch delete-merged-branch bot deleted the changelog-timestamps branch August 10, 2022 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lachmanfrantisek lachmanfrantisek lachmanfrantisek approved these changes

Assignees
No one assigned
Labels
mergeit Zuul, merge it!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Another case of failed %changelog timestamp format detection
2 participants
@nforro @lachmanfrantisek