diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-04 23:16:18 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-04 23:16:18 +0000 |
commit | 36dd7920a2ec671c8610cdc4e4a8866ec90675db (patch) | |
tree | b6ceebe1369524c9c09e52b9540984fc6a208685 /src/libstore/local-store.cc | |
parent | 0e9e599b00ff3cd23541ed911aa0932f4ab2cef7 (diff) | |
parent | 5b22a2c0d443ce1156f361af2dcb142d270daa6c (diff) |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/libstore/local-store.cc')
-rw-r--r-- | src/libstore/local-store.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 4b7b08b21..d6eba6e75 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1041,20 +1041,6 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source, } -StorePath LocalStore::addToStore(const string & name, const Path & _srcPath, - FileIngestionMethod method, HashType hashAlgo, PathFilter & filter, RepairFlag repair) -{ - Path srcPath(absPath(_srcPath)); - auto source = sinkToSource([&](Sink & sink) { - if (method == FileIngestionMethod::Recursive) - dumpPath(srcPath, sink, filter); - else - readFile(srcPath, sink); - }); - return addToStoreFromDump(*source, name, method, hashAlgo, repair); -} - - StorePath LocalStore::addToStoreFromDump(Source & source0, const string & name, FileIngestionMethod method, HashType hashAlgo, RepairFlag repair) { |