mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats 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);

2
src/libstore/binary-cache-store.hh
View file

@ -124,7 +124,7 @@ public:
Path addTextToStore(const string & name, const string & s,
const PathSet & references, bool repair = false) override;
void dumpPath(const Path & path, Sink & sink) override;
void narFromPath(const Path & path, Sink & sink) override;
void exportPath(const Path & path, bool sign, Sink & sink) override;

6
src/libstore/local-fs-store.cc
View file

@ -69,9 +69,11 @@ ref<FSAccessor> LocalFSStore::getFSAccessor()
return make_ref<LocalStoreAccessor>(ref<Store>(shared_from_this()));
}
void LocalFSStore::dumpPath(const Path & path, Sink & sink)
void LocalFSStore::narFromPath(const Path & path, Sink & sink)
{
nix::dumpPath(path, sink);
if (!isValidPath(path))
throw Error(format("path ‘%s’ is not valid") % path);
dumpPath(path, sink);
}
}

2
src/libstore/local-store.cc
View file

@ -1418,7 +1418,7 @@ Path LocalStore::addToStore(const string & name, const Path & _srcPath,
small files. */
StringSink sink;
if (recursive)
nix::dumpPath(srcPath, sink, filter);
dumpPath(srcPath, sink, filter);
else
sink.s = make_ref<std::string>(readFile(srcPath));

2
src/libstore/remote-store.cc
View file

@ -366,7 +366,7 @@ Path RemoteStore::addToStore(const string & name, const Path & _srcPath,
try {
conn->to.written = 0;
conn->to.warn = true;
nix::dumpPath(srcPath, conn->to, filter);
dumpPath(srcPath, conn->to, filter);
conn->to.warn = false;
conn->processStderr();
} catch (SysError & e) {

4
src/libstore/store-api.hh
View file

@ -223,7 +223,7 @@ public:
const PathSet & references, bool repair = false) = 0;
/* Write a NAR dump of a store path. */
virtual void dumpPath(const Path & path, Sink & sink) = 0;
virtual void narFromPath(const Path & path, Sink & sink) = 0;
/* Export a store path, that is, create a NAR dump of the store
path and append its references and its deriver. Optionally, a
@ -365,7 +365,7 @@ public:
class LocalFSStore : public Store
{
public:
void dumpPath(const Path & path, Sink & sink) override;
void narFromPath(const Path & path, Sink & sink) override;
ref<FSAccessor> getFSAccessor() override;
};

2
src/nix-store/nix-store.cc
View file

@ -784,7 +784,7 @@ static void opVerifyPath(Strings opFlags, Strings opArgs)
printMsg(lvlTalkative, format("checking path ‘%1%’...") % path);
ValidPathInfo info = store->queryPathInfo(path);
HashSink sink(info.narHash.type);
store->dumpPath(path, sink);
store->narFromPath(path, sink);
auto current = sink.finish();
if (current.first != info.narHash) {
printMsg(lvlError,