mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Detect SFTP disablement in paramiko + changelog updates
This commit is contained in:
parent
51083e48e9
commit
183fce6d99
2 changed files with 16 additions and 2 deletions
|
@ -6,6 +6,14 @@ Ansible Changes By Release
|
||||||
* I can barely see the roadmap from the heat coming off of it.
|
* I can barely see the roadmap from the heat coming off of it.
|
||||||
|
|
||||||
* login_unix_socket option for mysql user and database modules (see PR #781 for doc notes)
|
* login_unix_socket option for mysql user and database modules (see PR #781 for doc notes)
|
||||||
|
* new modules -- pip, easy_install, apt_repository, supervisorctl
|
||||||
|
* ansible --version will now give branch/SHA information if running from git
|
||||||
|
* error handling for setup module when SELinux is in a weird state
|
||||||
|
* misc yum module fixes
|
||||||
|
* better sudo permissions when encountering different umasks
|
||||||
|
* YAML syntax errors detected and show where the problem is
|
||||||
|
* better changed=True/False detection in user module on older Linux distros
|
||||||
|
* when using paramiko and SFTP is not accessible, do not traceback, but return a nice human readable msg
|
||||||
|
|
||||||
0.6 "Cabo" -- August 6, 2012
|
0.6 "Cabo" -- August 6, 2012
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,10 @@ class ParamikoConnection(object):
|
||||||
''' transfer a file from local to remote '''
|
''' transfer a file from local to remote '''
|
||||||
if not os.path.exists(in_path):
|
if not os.path.exists(in_path):
|
||||||
raise errors.AnsibleFileNotFound("file or module does not exist: %s" % in_path)
|
raise errors.AnsibleFileNotFound("file or module does not exist: %s" % in_path)
|
||||||
sftp = self.ssh.open_sftp()
|
try:
|
||||||
|
sftp = self.ssh.open_sftp()
|
||||||
|
except:
|
||||||
|
raise errors.AnsibleError("failed to open a SFTP connection")
|
||||||
try:
|
try:
|
||||||
sftp.put(in_path, out_path)
|
sftp.put(in_path, out_path)
|
||||||
except IOError:
|
except IOError:
|
||||||
|
@ -131,7 +134,10 @@ class ParamikoConnection(object):
|
||||||
|
|
||||||
def fetch_file(self, in_path, out_path):
|
def fetch_file(self, in_path, out_path):
|
||||||
''' save a remote file to the specified path '''
|
''' save a remote file to the specified path '''
|
||||||
sftp = self.ssh.open_sftp()
|
try:
|
||||||
|
sftp = self.ssh.open_sftp()
|
||||||
|
except:
|
||||||
|
raise errors.AnsibleError("failed to open a SFTP connection")
|
||||||
try:
|
try:
|
||||||
sftp.get(in_path, out_path)
|
sftp.get(in_path, out_path)
|
||||||
except IOError:
|
except IOError:
|
||||||
|
|
Loading…
Reference in a new issue