diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-25 17:06:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-03 22:02:51 +0200 |
| commit | b6ecbd266f614288db3468f9f054abea694105b1 (patch) | |
| tree | 289559ed8c2988c090e4d7e5350aab5f21a2efb8 /nix/libstore/remote-store.cc | |
| parent | 1f595ba474d8112e73df1ef7578014e59ebfccd0 (diff) | |
| download | guix-b6ecbd266f614288db3468f9f054abea694105b1.tar.gz | |
addToStore(): Take explicit name argument
Diffstat (limited to 'nix/libstore/remote-store.cc')
| -rw-r--r-- | nix/libstore/remote-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/libstore/remote-store.cc b/nix/libstore/remote-store.cc index 55156a9978..140fe9cf4e 100644 --- a/nix/libstore/remote-store.cc +++ b/nix/libstore/remote-store.cc @@ -385,7 +385,7 @@ Path RemoteStore::queryPathFromHashPart(const string & hashPart) } -Path RemoteStore::addToStore(const Path & _srcPath, +Path RemoteStore::addToStore(const string & name, const Path & _srcPath, bool recursive, HashType hashAlgo, PathFilter & filter, bool repair) { if (repair) throw Error("repairing is not supported when building through the Nix daemon"); @@ -395,7 +395,7 @@ Path RemoteStore::addToStore(const Path & _srcPath, Path srcPath(absPath(_srcPath)); writeInt(wopAddToStore, to); - writeString(baseNameOf(srcPath), to); + writeString(name, to); /* backwards compatibility hack */ writeInt((hashAlgo == htSHA256 && recursive) ? 0 : 1, to); writeInt(recursive ? 1 : 0, to); |