diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-07-26T19·25+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-07-26T19·25+0200 |
| commit | ee22a91ab847f63a22466f3bf63e33ca29da9cfe (patch) | |
| tree | 6808d04aeb5b66411014f252c1ee3c1f1e35d0d9 /src/libstore/download.cc | |
| parent | 06bbfb6004942bfcddd930e746ee7a2bfe5c3872 (diff) | |
makeFixedOutputPath(): Drop superfluous HashType argument
Diffstat (limited to 'src/libstore/download.cc')
| -rw-r--r-- | src/libstore/download.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index f099268953ab..cf3929cadd65 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -232,7 +232,7 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa Path expectedStorePath; if (expectedHash) { - expectedStorePath = store->makeFixedOutputPath(unpack, expectedHash.type, expectedHash, name); + expectedStorePath = store->makeFixedOutputPath(unpack, expectedHash, name); if (store->isValidPath(expectedStorePath)) return expectedStorePath; } @@ -282,7 +282,7 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa StringSink sink; dumpString(*res.data, sink); Hash hash = hashString(expectedHash ? expectedHash.type : htSHA256, *res.data); - info.path = store->makeFixedOutputPath(false, hash.type, hash, name); + info.path = store->makeFixedOutputPath(false, hash, name); info.narHash = hashString(htSHA256, *sink.s); store->addToStore(info, *sink.s, false, true); storePath = info.path; |