From ee22a91ab847f63a22466f3bf63e33ca29da9cfe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Jul 2016 21:25:52 +0200 Subject: makeFixedOutputPath(): Drop superfluous HashType argument --- src/libstore/download.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstore/download.cc') 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, 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, 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; -- cgit 1.4.1