wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 21:51:50 +02:00
Code Activity

make sure not to use cached channels for nix-channel --update

Browse source 
fixes #1964
This commit is contained in:
Yorick van Pelt 2018-05-09 15:23:08 +02:00
parent a1adcdf087
commit b9289e4855
No known key found for this signature in database
GPG key ID: D8D3CC6D951384DE
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/download.cc
View file

@ -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)) {