about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-08T16·32+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-08T16·35+0100
commit11cb4bfb257f18c906ef1d6f14ed450be8fa49fe (patch)
treee7b5412d151de4d64513187298cc31de1fa611dc
parent0fdf4da0e979f992db75cc17376e455ddc5a96d8 (diff)
Fix checking of NAR hashes
*headdesk*
*headdesk*
*headdesk*

So since commit 22144afa8d9f8968da351618a1347072a93bd8aa, Nix hasn't
actually checked whether the content of a downloaded NAR matches the
hash specified in the manifest / NAR info file.  Urghhh...
-rw-r--r--src/libstore/build.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index dcd7343394f9..4329d9a22b95 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2749,6 +2749,7 @@ void SubstitutionGoal::finished()
     logPipe.readSide.close();
 
     /* Get the hash info from stdout. */
+    string dummy = readLine(outPipe.readSide);
     string expectedHashStr = statusOk(status) ? readLine(outPipe.readSide) : "";
     outPipe.readSide.close();