From bb1034316d7dcafa2ab45762a6b6509e922c4c21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Mar 2016 14:21:45 +0100 Subject: Don't overload dumpPath() --- src/libstore/local-fs-store.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libstore/local-fs-store.cc') diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc index 87c216ec9f95..8b72c05b7b90 100644 --- a/src/libstore/local-fs-store.cc +++ b/src/libstore/local-fs-store.cc @@ -69,9 +69,11 @@ ref LocalFSStore::getFSAccessor() return make_ref(ref(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); } } -- cgit 1.4.1