wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +02:00
Code Activity

Don't overload dumpPath()

Browse source
This commit is contained in:
Eelco Dolstra 2016-03-22 14:21:45 +01:00
parent 712b616a84
commit bb1034316d
7 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/binary-cache-store.cc
View file

@ -156,7 +156,7 @@ bool BinaryCacheStore::isValidPath(const Path & storePath)
return fileExists(narInfoFileFor(storePath));
}
void BinaryCacheStore::dumpPath(const Path & storePath, Sink & sink)
void BinaryCacheStore::narFromPath(const Path & storePath, Sink & sink)
{
auto res = readNarInfo(storePath);
@ -189,7 +189,7 @@ void BinaryCacheStore::exportPath(const Path & storePath, bool sign, Sink & sink
auto res = readNarInfo(storePath);
dumpPath(storePath, sink);
narFromPath(storePath, sink);
// FIXME: check integrity of NAR.
@ -271,7 +271,7 @@ Path BinaryCacheStore::addToStore(const string & name, const Path & srcPath,
StringSink sink;
Hash h;
if (recursive) {
nix::dumpPath(srcPath, sink, filter);
dumpPath(srcPath, sink, filter);
h = hashString(hashAlgo, *sink.s);
} else {
auto s = readFile(srcPath);