From 2cd44d2e1ddf63c3cc8a02fd625c207d687cdbac Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Fri, 6 Jun 2025 18:09:46 +0200 Subject: [PATCH] libstore: don't wrap&unwrap connection handles this was only necessary for old protocols we no longer support. Change-Id: Iebb06ce6266c2c7c3f97da469b1295f4cb54ee5a --- lix/libstore/remote-store.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lix/libstore/remote-store.cc b/lix/libstore/remote-store.cc index f7c6b7a1c..7600679d4 100644 --- a/lix/libstore/remote-store.cc +++ b/lix/libstore/remote-store.cc @@ -359,8 +359,7 @@ kj::Promise>> RemoteStore::addCAToStore( const StorePathSet & references, RepairFlag repair) try { - std::optional conn_(TRY_AWAIT(getConnection())); - auto & conn = *conn_; + auto conn(TRY_AWAIT(getConnection())); conn->to << WorkerProto::Op::AddToStore @@ -523,8 +522,7 @@ kj::Promise>> RemoteStore::buildPathsWithRe try { TRY_AWAIT(copyDrvsFromEvalStore(paths, evalStore)); - std::optional conn_(TRY_AWAIT(getConnection())); - auto & conn = *conn_; + auto conn(TRY_AWAIT(getConnection())); conn->to << WorkerProto::Op::BuildPathsWithResults; conn->to << WorkerProto::write(*this, *conn, paths);