fix regression in s3.query from saltstack#33599 that causes pulling a…

… file list from s3 to fail
lomeroe · Jun 22, 2016 · 50ee968 · 50ee968
1 parent ad4f903
commit 50ee968
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/utils/s3.py b/salt/utils/s3.py
@@ -138,7 +138,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,