maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

builtins.fetch{url,tarball}: Allow name attribute

Browse source
This commit is contained in:
Shea Levy 2016-08-15 07:37:11 -04:00
parent eff80419c7
commit d52d391164
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/download.cc
View file

@ -243,13 +243,14 @@ ref<Downloader> makeDownloader()
return make_ref<CurlDownloader>();
}
Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpack, const Hash & expectedHash)
Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpack, string name, const Hash & expectedHash)
{
auto url = resolveUri(url_);
string name;
auto p = url.rfind('/');
if (p != string::npos) name = string(url, p + 1);
if (name == "") {
auto p = url.rfind('/');
if (p != string::npos) name = string(url, p + 1);
}
Path expectedStorePath;
if (expectedHash) {

2
src/libstore/download.hh
View file

@ -29,7 +29,7 @@ struct Downloader
{
virtual DownloadResult download(string url, const DownloadOptions & options) = 0;
Path downloadCached(ref<Store> store, const string & url, bool unpack,
Path downloadCached(ref<Store> store, const string & url, bool unpack, string name = "",
const Hash & expectedHash = Hash());
enum Error { NotFound, Forbidden, Misc, Transient };