Add user and group to makedirs cmd in file.copy #48375
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
rares-pop
reviewed
Jun 30, 2018
salt/states/file.py
Outdated
| @@ -5663,7 +5663,7 @@ def copy( | |||
| if not os.path.isdir(dname): | |||
| if makedirs: | |||
| try: | |||
| _makedirs(name=name) | |||
| _makedirs(name=name, user=user, group=group) | |||
There was a problem hiding this comment.
what about 'mode'? should that be added too?
There was a problem hiding this comment.
Additional question: salt/states/file.py also contains a lot more of those _makedirs(name=name) calls. Shouldn't those also be called with almost all parameters?
(provided that _makedirs does the right thing)
There was a problem hiding this comment.
@srkunze i looked at the other _makedirs calls and those functions do not include the user/group/mode arguments to the function so I think for this PR just adding it for file.copy will be fine and if we want to add the user/group arguments to the other functions that can be handled in another PR in develop.
also nice catch @rares-pop i'll work on adding that
|
Looks good to me! |
rallytime
approved these changes
Jul 10, 2018
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?
Ensures we are setting user and group when creating the directories before copying. @terminalmage one thing I was not certain about was the case when a user would use
preserve: True. Should I be grabbing the user perms of the original file and then create the directories with those permissions? Or would it be expected that the user would not userpreservewith make_dirs?What issues does this PR fix or reference?
#35595
Previous Behavior
Created directories with root user/group owners, not the ones specified in the state.
New Behavior
Creates directories with correct user/group owners
Tests written?
Yes
Commits signed with GPG?
Yes