[master] Fix to fileclient for ftp connections #55052
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
…e URL the port attribute ends up as None. The comparison that then takes place in ftplib errors out when comparing a None type to an int. This PR checks to see if the port is valid and if not sets it to the default FTP port.
ghost
requested a review
from 
dwoz
approved these changes
Jan 5, 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?
When an FTP URL is passed along to cp.get_url when urlparse parses the URL the port attribute ends up as None. The comparison that then takes place in ftplib errors out when comparing a None type to an int. This PR checks to see if the port is valid and if not sets it to the default FTP port.
What issues does this PR fix or reference?
#55019
Tests written?
Yes
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.