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/local-store.cc | |
parent | 06bbfb6004942bfcddd930e746ee7a2bfe5c3872 (diff) |
makeFixedOutputPath(): Drop superfluous HashType argument
Diffstat (limited to 'src/libstore/local-store.cc')
-rw-r--r-- | src/libstore/local-store.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 822d5fce3fb3..96ce6a0d893b 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -486,9 +486,9 @@ void LocalStore::checkDerivationOutputs(const Path & drvPath, const Derivation & if (out == drv.outputs.end()) throw Error(format("derivation ‘%1%’ does not have an output named ‘out’") % drvPath); - bool recursive; HashType ht; Hash h; - out->second.parseHashInfo(recursive, ht, h); - Path outPath = makeFixedOutputPath(recursive, ht, h, drvName); + bool recursive; Hash h; + out->second.parseHashInfo(recursive, h); + Path outPath = makeFixedOutputPath(recursive, h, drvName); StringPairs::const_iterator j = drv.env.find("out"); if (out->second.path != outPath || j == drv.env.end() || j->second != outPath) @@ -940,7 +940,7 @@ Path LocalStore::addToStoreFromDump(const string & dump, const string & name, { Hash h = hashString(hashAlgo, dump); - Path dstPath = makeFixedOutputPath(recursive, hashAlgo, h, name); + Path dstPath = makeFixedOutputPath(recursive, h, name); addTempRoot(dstPath); |