Advisory conflict resolution #1583
Merged
Conversation
This file contains 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
|
Hello @pavelpicka! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found: There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2020-02-11 14:52:11 UTC |
pavelpicka
force-pushed
the
5924-resolve-advisory-mirror
branch
2 times, most recently
from
f55e77c
to
292fa89
Compare
dralley
reviewed
Jan 30, 2020
CHANGES/5924.misc
Outdated
| @@ -0,0 +1 @@ | |||
| Fix advisory conflict resolution to check current version first and enabled SyncMutatedUpdateRecordTestCase. | |||
There was a problem hiding this comment.
I think the patch to enable the test was lost, because I don't believe it's enabled?
There was a problem hiding this comment.
Was not lost, there was intention to fix/enable it too but will need refactor of test itself (issue #6015 on pulp.plan.io) before just enable it.
dralley
requested changes
Feb 6, 2020
There was a problem hiding this comment.
@pavelpicka Please re-enable the test
pulp_rpm/pulp_rpm/tests/functional/api/test_sync.py
Lines 409 to 412 in 292fa89
|
Code changes look good, thanks. |
pavelpicka
force-pushed
the
5924-resolve-advisory-mirror
branch
from
292fa89
to
ba778dd
Compare
Advisory conflict resolution now check current version first if advisory resolution is needed. Required PR: pulp#1568 closes: #5924 https://pulp.plan.io/issues/5924
pavelpicka
force-pushed
the
5924-resolve-advisory-mirror
branch
from
ba778dd
to
33761b7
Compare
goosemania
approved these changes
Feb 11, 2020
dralley
approved these changes
Feb 11, 2020
pavelpicka
pushed a commit
to pavelpicka/pulp_rpm
that referenced
this pull request
Feb 12, 2020
…rror Advisory conflict resolution
pavelpicka
pushed a commit
to pavelpicka/pulp_rpm
that referenced
this pull request
Feb 12, 2020
…rror Advisory conflict resolution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Advisory conflict resolution now check current version first if advisory
resolution is needed.
Required PR: #1568
closes: #5924
https://pulp.plan.io/issues/5924