aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/remote-fs-accessor.hh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-10-17 20:51:42 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-10-17 20:51:42 +0200
commit11ba4302e3666d3860ca83b734217afe07f22de2 (patch)
tree9efd9aa3d45fad3b306ab985f9403381a9dd0e7d /src/libstore/remote-fs-accessor.hh
parentcbc216911dbda23c3bc050c969bc725fe60760ef (diff)
Remove BinaryCacheStoreAccessor
Probably as a result of a bad merge in 4b8f1b0ec066a5b994747b1afd050f5f62d857f6, we had both a BinaryCacheStoreAccessor and a RemoteFSAccessor. BinaryCacheStore::getFSAccessor() returned the latter, but BinaryCacheStore::addToStore() checked for the former. This probably caused hydra-queue-runner to download paths that it just uploaded.
Diffstat (limited to 'src/libstore/remote-fs-accessor.hh')
-rw-r--r--src/libstore/remote-fs-accessor.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstore/remote-fs-accessor.hh b/src/libstore/remote-fs-accessor.hh
index 28f36c829..df8b7b162 100644
--- a/src/libstore/remote-fs-accessor.hh
+++ b/src/libstore/remote-fs-accessor.hh
@@ -13,6 +13,9 @@ class RemoteFSAccessor : public FSAccessor
std::map<Path, ref<FSAccessor>> nars;
std::pair<ref<FSAccessor>, Path> fetch(const Path & path_);
+
+ friend class BinaryCacheStore;
+
public:
RemoteFSAccessor(ref<Store> store);