salt.fileserver.roots: Fix regression in symlink_list #39409
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
A recent PR of mine removed the logic in symlink_list and fell back to the cached file list generated in _file_lists(). However, this code dates back from before the fileserver backends' symlink_list() functions were modified to return a dict mapping links to their destinations. This fixes the code in _file_lists() so that it returns the correct data. It also fixes the fact that '.' was showing up in the dir list produced by _file_lists(), and updates the associated integration test to include the cachedir in the mocked opts.
rallytime
approved these changes
Feb 14, 2017
There was a problem hiding this comment.
I think this looks good, but it's probably good to have @cachedout review it as well.
|
Looks good to me as well |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Feb 17, 2017
* commit '3fc1e2c9f836a4603b01155fef9d9c7347fb8477': (72 commits) grammar in states/top.rst add Salt Enterprise photo add 2016.11.3 changelog to release notes (saltstack#39451) Remove global dunder definistions from tests Port f847639 into Nitrogen Add release notes for cisco proxy minions added in Carbon NAPALM proxy: add alive function for proxy keepalive Enhance NAPALM grains Improve introduction to explain the purpose of orchestration Have mysql state error out on non-existant file Fix fileserver.fileclient reference Change ``path`` value from a tuple to a list Add additional tests to the Windows whitelist Add version control to SPM repo creation set default user variable to the user cmd runs as Fix documentation for detach's default value salt.fileserver.roots: Fix regression in symlink_list (saltstack#39409) Add sleep to eval_master Don't overwrite self.host w/IPv6 brackets Salt-SSH deal with raw IPv6 addresses ...
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.
A recent PR of mine (#39337) removed the logic in symlink_list and fell back to the cached file list generated in
_file_lists(). However, this code dates back from before the fileserver backends'symlink_list()functions were modified to return a dict mapping links to their destinations.This fixes the code in
_file_lists()so that it returns the correct data. It also fixes the fact that.was showing up in the dir list produced by_file_lists(), and updates the associated integration test to include the cachedir in the mocked opts.