Fix fetch_file() method

10 years ago · e461241d7b
parent d0d9be30d5
commit e461241d7b
3 changed files with 9 additions and 3 deletions
--- a/lib/ansible/plugins/connections/chroot.py
+++ b/lib/ansible/plugins/connections/chroot.py
@ -140,8 +140,10 @@ class Connection(object):

        with open(out_path, 'wb+') as out_file:
            try:
-                for chunk in p.stdout.read(BUFSIZE):
+                chunk = p.stdout.read(BUFSIZE)
+                while chunk:
                    out_file.write(chunk)
+                    chunk = p.stdout.read(BUFSIZE)
            except:
                traceback.print_exc()
                raise errors.AnsibleError("failed to transfer file %s to %s" % (in_path, out_path))
--- a/lib/ansible/plugins/connections/jail.py
+++ b/lib/ansible/plugins/connections/jail.py
@ -162,8 +162,10 @@ class Connection(object):

        with open(out_path, 'wb+') as out_file:
            try:
-                for chunk in p.stdout.read(BUFSIZE):
+                chunk = p.stdout.read(BUFSIZE)
+                while chunk:
                    out_file.write(chunk)
+                    chunk = p.stdout.read(BUFSIZE)
            except:
                traceback.print_exc()
                raise errors.AnsibleError("failed to transfer file %s to %s" % (in_path, out_path))
--- a/lib/ansible/plugins/connections/zone.py
+++ b/lib/ansible/plugins/connections/zone.py
@ -177,8 +177,10 @@ class Connection(object):

        with open(out_path, 'wb+') as out_file:
            try:
-                for chunk in p.stdout.read(BUFSIZE):
+                chunk = p.stdout.read(BUFSIZE)
+                while chunk:
                    out_file.write(chunk)
+                    chunk = p.stdout.read(BUFSIZE)
            except:
                traceback.print_exc()
                raise errors.AnsibleError("failed to transfer file %s to %s" % (in_path, out_path))