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 #38982 from rallytime/fix-34780

Browse source 
Set response when using "GET" method in s3 utils
This commit is contained in:
Mike Place 2017-01-27 10:04:47 -07:00 • committed by GitHub
commit 85165edb70
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

@ -129,7 +129,6 @@ def query(key, keyid, method='GET', params=None, headers=None,
if not data:
data = None
response = None
if method == 'PUT':
if local_file:
with salt.utils.fopen(local_file, 'r') as data:
@ -147,6 +146,7 @@ def query(key, keyid, method='GET', params=None, headers=None,
data=data,
verify=verify_ssl,
stream=True)
response = result.content
else:
result = requests.request(method,
requesturl,