From e7ce22555853abfc8d28fc15296a1c57a25e2c6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Mar 2016 17:51:32 +0100
Subject: [PATCH] Fix build

---
 src/hydra-queue-runner/hydra-queue-runner.cc    | 2 --
 src/hydra-queue-runner/s3-binary-cache-store.cc | 6 ++----
 src/hydra-queue-runner/s3-binary-cache-store.hh | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index aa4c068c..8ad86019 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -773,7 +773,6 @@ void State::run(BuildID buildOne)
         _destStore = openLocalBinaryCacheStore(
             _localStore,
             hydraConfig["binary_cache_secret_key_file"],
-            hydraConfig["binary_cache_public_key_file"],
             dir);
     }
 
@@ -784,7 +783,6 @@ void State::run(BuildID buildOne)
         auto store = make_ref<S3BinaryCacheStore>(
             _localStore,
             hydraConfig["binary_cache_secret_key_file"],
-            hydraConfig["binary_cache_public_key_file"],
             bucketName);
         store->init();
         _destStore = std::shared_ptr<S3BinaryCacheStore>(store);
diff --git a/src/hydra-queue-runner/s3-binary-cache-store.cc b/src/hydra-queue-runner/s3-binary-cache-store.cc
index bf1e9884..659448d4 100644
--- a/src/hydra-queue-runner/s3-binary-cache-store.cc
+++ b/src/hydra-queue-runner/s3-binary-cache-store.cc
@@ -32,9 +32,8 @@ R && checkAws(const FormatOrString & fs, Aws::Utils::Outcome<R, E> && outcome)
 }
 
 S3BinaryCacheStore::S3BinaryCacheStore(std::shared_ptr<Store> localStore,
-    const Path & secretKeyFile, const Path & publicKeyFile,
-    const std::string & bucketName)
-    : BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)
+    const Path & secretKeyFile, const std::string & bucketName)
+    : BinaryCacheStore(localStore, secretKeyFile)
     , bucketName(bucketName)
     , config(makeConfig())
     , client(make_ref<Aws::S3::S3Client>(*config))
@@ -177,4 +176,3 @@ std::string S3BinaryCacheStore::getFile(const std::string & path)
 }
 
 }
-
diff --git a/src/hydra-queue-runner/s3-binary-cache-store.hh b/src/hydra-queue-runner/s3-binary-cache-store.hh
index 1ba78dce..d1b9f6dc 100644
--- a/src/hydra-queue-runner/s3-binary-cache-store.hh
+++ b/src/hydra-queue-runner/s3-binary-cache-store.hh
@@ -21,8 +21,7 @@ private:
 public:
 
     S3BinaryCacheStore(std::shared_ptr<Store> localStore,
-        const Path & secretKeyFile, const Path & publicKeyFile,
-        const std::string & bucketName);
+        const Path & secretKeyFile, const std::string & bucketName);
 
     void init() override;