valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17247 from rallytime/bp-17188

Browse Source 
Backport #17188 to 2014.7
This commit is contained in:
Thomas S Hatch 2014-11-06 16:58:06 -07:00
commit 1845145c19
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/fileclient.py
View File

@ -590,7 +590,12 @@ class Client(object):
else:
fixed_url = url
try:
response = requests.get(fixed_url, stream=True)
if requests.__version__[0] == '0':
# 'stream' was called 'prefetch' before 1.0, with flipped meaning
get_kwargs = {'prefetch': False}
else:
get_kwargs = {'stream': True}
response = requests.get(fixed_url, **get_kwargs)
with salt.utils.fopen(dest, 'wb') as destfp:
for chunk in response.iter_content(chunk_size=32*1024):
destfp.write(chunk)