saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #34209 from lomeroe/fix_s3_utils_regression_33682

Browse source 
fix regression in s3.query from #33682
This commit is contained in:
Mike Place 2016-06-22 11:50:19 -07:00 • committed by GitHub
commit 4205fd605c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/s3.py
View file

@ -137,7 +137,7 @@ def query(key, keyid, method='GET', params=None, headers=None,
verify=verify_ssl,
stream=True)
response = result.content
elif method == 'GET' and not return_bin:
elif method == 'GET' and local_file and not return_bin:
result = requests.request(method,
requesturl,
headers=headers,