From 38442e31230863df9eaa3ac98670e3d7357f2c26 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Thu, 25 Apr 2024 01:13:50 +0200 Subject: [PATCH] filetransfer: remove decompress request parameter this is never read. Change-Id: I4c46f140519843a21e452958900e81edd2f78be2 --- src/libstore/builtins/fetchurl.cc | 1 - src/libstore/filetransfer.hh | 1 - src/nix/prefetch.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc index 3d87bdc21..6bf46dad8 100644 --- a/src/libstore/builtins/fetchurl.cc +++ b/src/libstore/builtins/fetchurl.cc @@ -38,7 +38,6 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData) the result anyway. */ FileTransferRequest request(url); request.verifyTLS = false; - request.decompress = false; auto decompressor = makeDecompressionSink( unpack && mainUrl.ends_with(".xz") ? "xz" : "none", sink); diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh index a3b0dde1f..6c11c14ee 100644 --- a/src/libstore/filetransfer.hh +++ b/src/libstore/filetransfer.hh @@ -59,7 +59,6 @@ struct FileTransferRequest size_t tries = fileTransferSettings.tries; unsigned int baseRetryTimeMs = 250; ActivityId parentAct; - bool decompress = true; std::optional data; std::string mimeType; std::function dataCallback; diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index 8f74984e0..2457e4cc8 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -98,7 +98,6 @@ std::tuple prefetchFile( FdSink sink(fd.get()); FileTransferRequest req(url); - req.decompress = false; getFileTransfer()->download(std::move(req), sink); }