Backport #23171 to 2014.7 #23228
Merged
Backport #23171 to 2014.7 #23228
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
Upon testing (in my Windows environment), I noticed that in
clean_proc_dir():
job = salt.payload.Serial(opts).load(fp_)
The result would always be that 'job' is None. Upon further
investigation, this seems to be the case because of this line above:
job_data = fp_.read()
If I remove that line, things work as expected. So it seems like the
'fp_.read()' will move the current file position of 'fp_' to the end,
and so 'salt.payload.Serial(opts).load(fp_)' would end up reading what
it thinks is an empty file.
Looking at the logic, it seems like 'job_data = fp_.read()' is an
unnecessary step in any case, so it has been removed.
I have noticed that this same incorrect logic also exists in the 2015.2
and 2014.7 branches.
Also, added a fix for deleting files on Windows which was already in
another part of the same function.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
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.
Backport #23171 to 2014.7