[2016.3] Merge forward from 2015.8 into 2016.3 #35903
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
This was initially broken in 75fd92f. The documented behavior of this function is to return an empty string for the package when the package is up-to-date. Changing that behavior negatively affects the pkg.latest state, which relies on the documented behavior.
These comments explain what is being done as we evaluate which packages need to be added to the install targets and which do not.
In this scenario, ``avail[pkg]`` contains an empty string, we want to reinstall the current version with new USE flags so the currently-installed version is what we need to add to the targets.
…st-logic Add clarifying comments to the pkg.latest state, fix USE flag condition
pacman.py: Fix incorrect return in pkg.latest_version
[BACKPORT 2015.8] salt-cloud: fix path to Salt Master socket dir
No conflicts.
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.
No conflicts.