Skip to content

Commit

Permalink
fix regression from saltstack#33681 which causes pulling a list of s3…
Browse files Browse the repository at this point in the history
… objects via s3.query to fail
  • Loading branch information
lomeroe committed Jun 22, 2016
1 parent 5bca5c4 commit 6742f48
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/utils/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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,
Expand Down

0 comments on commit 6742f48

Please sign in to comment.