diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-05-15T12·57+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-15T12·57+0200 |
| commit | 966407bcf1cf86de508b20fef43cffb81d8a87dc (patch) | |
| tree | e3c2ef406ae80f3f30cbb95830e7aa38ae590839 /src/libstore | |
| parent | 1ad19232c4bbecb06e6acbb2a3a538544a28e1f2 (diff) | |
| parent | b9289e4855d0221825c6f673d64f69802daa6b42 (diff) | |
Merge pull request #2145 from serokell/uncached-channel
make sure not to use cached channels for nix-channel --update
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/download.cc | 3 | ||||
| -rw-r--r-- | src/libstore/download.hh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 18f9094f82e0..54f4dd218007 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -623,7 +623,7 @@ DownloadResult Downloader::download(const DownloadRequest & request) return enqueueDownload(request).get(); } -Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpack, string name, const Hash & expectedHash, string * effectiveUrl) +Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpack, string name, const Hash & expectedHash, string * effectiveUrl, int ttl) { auto url = resolveUri(url_); @@ -653,7 +653,6 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa string expectedETag; - int ttl = settings.tarballTtl; bool skip = false; if (pathExists(fileLink) && pathExists(dataFile)) { diff --git a/src/libstore/download.hh b/src/libstore/download.hh index 0b8d29b21dfe..7ade756fc356 100644 --- a/src/libstore/download.hh +++ b/src/libstore/download.hh @@ -2,6 +2,7 @@ #include "types.hh" #include "hash.hh" +#include "globals.hh" #include <string> #include <future> @@ -54,7 +55,7 @@ struct Downloader use the recorded ETag to verify if the server has a more recent version, and if so, download it to the Nix store. */ Path downloadCached(ref<Store> store, const string & uri, bool unpack, string name = "", - const Hash & expectedHash = Hash(), string * effectiveUri = nullptr); + const Hash & expectedHash = Hash(), string * effectiveUri = nullptr, int ttl = settings.tarballTtl); enum Error { NotFound, Forbidden, Misc, Transient, Interrupted }; }; |