diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-02-07 13:32:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 13:32:35 +0100 |
| commit | abe6be578b501e265a3c4a0c33995c4848f28f56 (patch) | |
| tree | 7882f63a1dcfa25b6504fb229541b11b751c5709 /src/libstore | |
| parent | 6f6bfc820544c3fe9cc35ec67ed3f9d4c6a293a3 (diff) | |
| parent | 69d82e5c58bf6d7e16fc296f598c352da2a618d0 (diff) | |
Merge pull request #1816 from shlevy/add-path
Add path primop.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/store-api.cc | 5 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 77ab87ef7..7abb300a9 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -222,11 +222,10 @@ Path Store::makeTextPath(const string & name, const Hash & hash, } -std::pair<Path, Hash> Store::computeStorePathForPath(const Path & srcPath, - bool recursive, HashType hashAlgo, PathFilter & filter) const +std::pair<Path, Hash> Store::computeStorePathForPath(const string & name, + const Path & srcPath, bool recursive, HashType hashAlgo, PathFilter & filter) const { Hash h = recursive ? hashPath(hashAlgo, srcPath, filter).first : hashFile(hashAlgo, srcPath); - string name = baseNameOf(srcPath); Path dstPath = makeFixedOutputPath(recursive, h, name); return std::pair<Path, Hash>(dstPath, h); } diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index aa83c2ded..563aa566b 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -307,9 +307,9 @@ public: /* This is the preparatory part of addToStore(); it computes the store path to which srcPath is to be copied. Returns the store path and the cryptographic hash of the contents of srcPath. */ - std::pair<Path, Hash> computeStorePathForPath(const Path & srcPath, - bool recursive = true, HashType hashAlgo = htSHA256, - PathFilter & filter = defaultPathFilter) const; + std::pair<Path, Hash> computeStorePathForPath(const string & name, + const Path & srcPath, bool recursive = true, + HashType hashAlgo = htSHA256, PathFilter & filter = defaultPathFilter) const; /* Preparatory part of addTextToStore(). |