Implicitly ignore epoch when no epoch in desired version, and ignore_epoch not passed #56681
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
This was referenced Apr 17, 2020
cmcmarrow
approved these changes
Apr 20, 2020
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.
What does this PR do?
A usability tweak for
pkgstates on platforms that support pkg epochs.In the process of adding a test case for this, I encountered a major testing oversight that was merged on Jan 9th in #55707. By moving the lists of package targets into the class, they weren't defined until after the decorators had already ran. This means that most of these decorated tests were being skipped all the time, on all platforms. Not great, Bob!
I've moved the skip logic back within the actual tests, where they were before the decorators were added last autumn in 291579c.
What issues does this PR fix or reference?
#56654
#55707
Previous Behavior
Epochs were strictly enforced in package comparisons (i.e.
2.3-4would not be a match if the actual version of the package was1:2.3-4), unlessignore_epochwas set toTrue.New Behavior
Now, when no value is explicitly passed this argument, the epoch will be implicitly skipped if the desired version does not itself contain an epoch. This will allow for much more natural version handling, instead of requiring the user to always know beforehand when they are dealing with a package that has an epoch in the version.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No