From 4a1356c0b28ba219ee9da66630e9eb0a15f804ea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 14 Mar 2018 12:09:41 +0000
Subject: [PATCH] Correctly catch 404 errors

The docs are super unclear on how one should catch a missing file
exception, but empirically this should catch the errors we're seeing.
---
 s3_storage_provider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s3_storage_provider.py b/s3_storage_provider.py
index ad9c95d..1ec4951 100644
--- a/s3_storage_provider.py
+++ b/s3_storage_provider.py
@@ -118,7 +118,7 @@ class _S3DownloadThread(threading.Thread):
         try:
             resp = s3.get_object(Bucket=self.bucket, Key=self.key)
         except botocore.exceptions.ClientError as e:
-            if e.response['Error']['Code'] == "404":
+            if e.response['Error']['Code'] in ("404", "NoSuchKey",):
                 reactor.callFromThread(self.deferred.callback, None)
                 return