cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Download remote apt deb file in bytes mode in Python 2 and 3

Browse source 
Fixes #19710
This commit is contained in:
James Cooke 2017-02-19 17:02:44 +00:00 committed by Toshio Kuratomi
parent 9f0b354023
commit 8ec28a2ba4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/packaging/os/apt.py
View file

@ -234,7 +234,7 @@ import time
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_bytes, to_native
from ansible.module_utils.urls import fetch_url from ansible.module_utils.urls import fetch_url
# APT related constants # APT related constants
@ -716,12 +716,14 @@ def download(module, deb):
try: try:
rsp, info = fetch_url(module, deb) rsp, info = fetch_url(module, deb)
f = open(package, 'w') # Ensure file is open in binary mode for Python 3
f = open(package, 'wb')
# Read 1kb at a time to save on ram # Read 1kb at a time to save on ram
while True: while True:
data = rsp.read(BUFSIZE) data = rsp.read(BUFSIZE)
data = to_bytes(data, errors='surrogate_or_strict')
if data == "": if len(data) < 1:
break # End of file, break while loop break # End of file, break while loop
f.write(data) f.write(data)