From 325f937cca26bf7b68506ed60d54e6b8e2ff6e1b Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Mon, 30 Jun 2025 22:22:20 +0200 Subject: [PATCH] remove old commented-out checkInterrupt calls Change-Id: I843ee341ecfb4cb8be995b9e5ac628f75a4c7e4b --- lix/libexpr/eval-inline.hh | 1 - lix/libstore/s3-binary-cache-store.cc | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lix/libexpr/eval-inline.hh b/lix/libexpr/eval-inline.hh index 9a5211e70..2281669db 100644 --- a/lix/libexpr/eval-inline.hh +++ b/lix/libexpr/eval-inline.hh @@ -73,7 +73,6 @@ void EvalState::forceValue(Value & v, const PosIdx pos) Expr & expr = *v.thunk.expr; try { v.mkBlackhole(); - //checkInterrupt(); expr.eval(*this, *env, v); } catch (...) { v.mkThunk(env, expr); diff --git a/lix/libstore/s3-binary-cache-store.cc b/lix/libstore/s3-binary-cache-store.cc index e192e719c..7a40f2238 100644 --- a/lix/libstore/s3-binary-cache-store.cc +++ b/lix/libstore/s3-binary-cache-store.cc @@ -409,12 +409,9 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore transferConfig.bufferSize = config().bufferSize; transferConfig.uploadProgressCallback = - [](const TransferManager *transferManager, - const std::shared_ptr - &transferHandle) - { - //FIXME: find a way to properly abort the multipart upload. - //checkInterrupt(); + [](const TransferManager * transferManager, + const std::shared_ptr & transferHandle) { + // FIXME: find a way to properly abort the multipart upload. debug("upload progress ('%s'): '%d' of '%d' bytes", transferHandle->GetKey(), transferHandle->GetBytesTransferred(),