another try when file doesn't exist

8828 · Nov 16, 2016 · e196194 · e196194
1 parent 0b50ebd
commit e196194
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/conda/gateways/adapters/localfs.py b/conda/gateways/adapters/localfs.py
@@ -5,6 +5,7 @@
 from logging import getLogger
 from mimetypes import guess_type
 from os import lstat
+from os.path import isfile
 from requests.adapters import BaseAdapter
 from requests.models import Response
 from requests.structures import CaseInsensitiveDict
@@ -29,17 +30,20 @@ def send(self, request, stream=None, timeout=None, verify=None, cert=None, proxi
             resp.status_code = 404
             resp.raw = exc
         else:
-            modified = formatdate(stats.st_mtime, usegmt=True)
-            content_type = guess_type(pathname)[0] or "text/plain"
-            resp.headers = CaseInsensitiveDict({
-                "Content-Type": content_type,
-                "Content-Length": stats.st_size,
-                "Last-Modified": modified,
-            })
-
-            resp.raw = open(pathname, "rb")
-            resp.close = resp.raw.close
-
+            if isfile(pathname):
+                modified = formatdate(stats.st_mtime, usegmt=True)
+                content_type = guess_type(pathname)[0] or "text/plain"
+                resp.headers = CaseInsensitiveDict({
+                    "Content-Type": content_type,
+                    "Content-Length": stats.st_size,
+                    "Last-Modified": modified,
+                })
+
+                resp.raw = open(pathname, "rb")
+                resp.close = resp.raw.close
+            else:
+                resp.status_code = 404
+                resp.raw = b'{"error": "file does not exist", "path": "%s"}' % pathname
         return resp
 
     def close(self):