diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-01T13·48+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-01T13·48+0000 |
| commit | 24f863d86b0316c736fe9e89998cd442b8a400dd (patch) | |
| tree | 2d382419d4dc57f166860d3ba660087bfeda4894 /src/libstore | |
| parent | be9be4c1476a46e9d0996d89613ce44d9aaa6da4 (diff) | |
* When doing "nix-store --add-fixed" without "--recursive" via the Nix
daemon (which is an error), print a nicer error message than "Connection reset by peer" or "broken pipe". * In the daemon, log errors that occur during request parameter processing.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/remote-store.cc | 2 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 568a6aa58a35..0c6a1c37d1ec 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -328,7 +328,7 @@ Path RemoteStore::addToStore(const Path & _srcPath, openConnection(); Path srcPath(absPath(_srcPath)); - + writeInt(wopAddToStore, to); writeString(baseNameOf(srcPath), to); /* backwards compatibility hack */ diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 8bfb09880edd..e3a2c0daa20c 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -151,9 +151,7 @@ public: /* Copy the contents of a path to the store and register the validity the resulting path. The resulting path is returned. - If `fixed' is true, then the output of a fixed-output - derivation is pre-loaded into the Nix store. The function - object `filter' can be used to exclude files (see + The function object `filter' can be used to exclude files (see libutil/archive.hh). */ virtual Path addToStore(const Path & srcPath, bool recursive = true, HashType hashAlgo = htSHA256, |