From 7f103dcddd4cf3c0748b7a379a117f3262c4c5f7 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:11:05 +0200
Subject: Properly filter the stores according to their declared uriSchemes

When opening a store, only try the stores whose `uriSchemes()` include
the current one
---
 src/libstore/s3-binary-cache-store.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libstore/s3-binary-cache-store.cc')

diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 30ef4082a..020b20c37 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -197,6 +197,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
     S3Helper s3Helper;
 
     S3BinaryCacheStoreImpl(
+        [[maybe_unused]] const std::string & scheme,
         const std::string & bucketName,
         const Params & params)
         : StoreConfig(params)
@@ -434,7 +435,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
         return paths;
     }
 
-    static std::vector<std::string> uriPrefixes() { return {"s3"}; }
+    static std::set<std::string> uriSchemes() { return {"s3"}; }
 
 };
 
-- 
cgit v1.2.3