gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ansibleerrors in qubes connection plugin

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2016-06-12 15:13:48 +00:00
parent 3347647e79
commit e8ce3c3bf0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/connection_plugins/qubes.py
View File

@ -127,16 +127,16 @@ class Connection(ConnectionBase):
try: try:
p = self._buffered_exec_command('dd of=%s bs=%s' % (out_path, BUFSIZE), stdin=in_file) p = self._buffered_exec_command('dd of=%s bs=%s' % (out_path, BUFSIZE), stdin=in_file)
except OSError: except OSError:
raise AnsibleError("chroot connection requires dd command in the chroot") raise errors.AnsibleError("chroot connection requires dd command in the chroot")
try: try:
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
except: except:
traceback.print_exc() traceback.print_exc()
raise AnsibleError("failed to transfer file %s to %s" % (in_path, out_path)) raise errors.AnsibleError("failed to transfer file %s to %s" % (in_path, out_path))
if p.returncode != 0: if p.returncode != 0:
raise AnsibleError("failed to transfer file %s to %s:\n%s\n%s" % (in_path, out_path, stdout, stderr)) raise errors.AnsibleError("failed to transfer file %s to %s:\n%s\n%s" % (in_path, out_path, stdout, stderr))
except IOError: except IOError:
raise AnsibleError("file or module does not exist at: %s" % in_path) raise errors.AnsibleError("file or module does not exist at: %s" % in_path)
def _prefix_login_path(self, remote_path): def _prefix_login_path(self, remote_path):
''' Make sure that we put files into a standard path ''' Make sure that we put files into a standard path
@ -162,7 +162,7 @@ class Connection(ConnectionBase):
try: try:
p = self._buffered_exec_command('dd if=%s bs=%s' % (in_path, BUFSIZE)) p = self._buffered_exec_command('dd if=%s bs=%s' % (in_path, BUFSIZE))
except OSError: except OSError:
raise AnsibleError("Qubes connection requires dd command in the chroot") raise errors.AnsibleError("Qubes connection requires dd command in the chroot")
with open(out_path, 'wb+') as out_file: with open(out_path, 'wb+') as out_file:
try: try:
@ -172,10 +172,10 @@ class Connection(ConnectionBase):
chunk = p.stdout.read(BUFSIZE) chunk = p.stdout.read(BUFSIZE)
except: except:
traceback.print_exc() traceback.print_exc()
raise AnsibleError("failed to transfer file %s to %s" % (in_path, out_path)) raise errors.AnsibleError("failed to transfer file %s to %s" % (in_path, out_path))
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise AnsibleError("failed to transfer file %s to %s:\n%s\n%s" % (in_path, out_path, stdout, stderr)) raise errors.AnsibleError("failed to transfer file %s to %s:\n%s\n%s" % (in_path, out_path, stdout, stderr))
def close(self): def close(self):
''' terminate the connection; nothing to do here ''' ''' terminate the connection; nothing to do here '''