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.

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

Taught advisory-upload to handle advisory-conflicts better. #1973

Merged
merged 1 commit into from Apr 27, 2021
Merged

Taught advisory-upload to handle advisory-conflicts better. #1973

merged 1 commit into from Apr 27, 2021

Conversation

ggainey
Copy link
Contributor

@ggainey ggainey commented Apr 20, 2021

fixes #7282

@pulpbot
Copy link
Member

pulpbot commented Apr 20, 2021

Attached issue: https://pulp.plan.io/issues/7282

@ggainey ggainey force-pushed the 7282_advisory_merge_failure branch from cfbdd44 to b5a3417 Compare April 20, 2021 02:17
@ggainey ggainey force-pushed the 7282_advisory_merge_failure branch from b5a3417 to 081dfcd Compare April 21, 2021 21:06
@ggainey
Copy link
Contributor Author

ggainey commented Apr 22, 2021

I think I've found some unintended behavior from this fix - do not merge until I can do more testing/remove WIP label

@ggainey ggainey force-pushed the 7282_advisory_merge_failure branch from 081dfcd to a609d68 Compare April 26, 2021 18:33
@ggainey
Copy link
Contributor Author

ggainey commented Apr 26, 2021

I think I've found some unintended behavior from this fix - do not merge until I can do more testing/remove WIP label

I was wrong, this works in all my scenarios. Rebased to master and repushed.

@dralley @goosemania More Advisory Delight (MAD) ready for review when you have some spare minutes.

dralley
dralley reviewed Apr 26, 2021
View reviewed changes
pulp_rpm/app/advisory.py Outdated Show resolved Hide resolved
goosemania
goosemania approved these changes Apr 27, 2021
View reviewed changes
Copy link
Member

@goosemania goosemania left a comment

Choose a reason for hiding this comment

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

Thanks for the fix and especially for the tests!

pulp_rpm/app/advisory.py Show resolved Hide resolved
pulp_rpm/app/serializers/advisory.py Show resolved Hide resolved
@ggainey ggainey force-pushed the 7282_advisory_merge_failure branch from a609d68 to 4902761 Compare April 27, 2021 12:39
@ggainey ggainey merged commit 99e3294 into pulp:master Apr 27, 2021
@ggainey ggainey deleted the 7282_advisory_merge_failure branch March 31, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dralley dralley dralley left review comments

@ipanova ipanova ipanova left review comments

@goosemania goosemania goosemania approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ggainey @pulpbot @dralley @ipanova @goosemania