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/build.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstore/build.cc') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index af2c908c30..10ae574f9e 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2706,8 +2706,8 @@ void DerivationGoal::registerOutputs() hash). */ if (i.second.hash != "") { - bool recursive; HashType ht; Hash h; - i.second.parseHashInfo(recursive, ht, h); + bool recursive; Hash h; + i.second.parseHashInfo(recursive, h); if (!recursive) { /* The output path should be a regular file without @@ -2719,11 +2719,11 @@ void DerivationGoal::registerOutputs() /* Check the hash. In hash mode, move the path produced by the derivation to its content-addressed location. */ - Hash h2 = recursive ? hashPath(ht, actualPath).first : hashFile(ht, actualPath); + Hash h2 = recursive ? hashPath(h.type, actualPath).first : hashFile(h.type, actualPath); if (buildMode == bmHash) { - Path dest = worker.store.makeFixedOutputPath(recursive, ht, h2, drv->env["name"]); + Path dest = worker.store.makeFixedOutputPath(recursive, h2, drv->env["name"]); printMsg(lvlError, format("build produced path ‘%1%’ with %2% hash ‘%3%’") - % dest % printHashType(ht) % printHash16or32(h2)); + % dest % printHashType(h.type) % printHash16or32(h2)); if (worker.store.isValidPath(dest)) return; Path actualDest = worker.store.toRealPath(dest); -- cgit 1.4.1