diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-12-17 12:25:47 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-12-18 01:16:47 +0100 |
commit | 2d4d26769d6a3be1b21302b0bb2bd099fd55ccf8 (patch) | |
tree | 1b975e7063a14a4972852df5129befad57b159c2 /nix | |
parent | 239bfe2ec1fa3b4305500211e6cade6e4bda2a62 (diff) |
daemon: Make "opening file" error messages distinguishable.
* nix/libstore/build.cc (DerivationGoal::openLogFile): Customize
"opening file" error message.
* nix/libutil/hash.cc (hashFile): Likewise.
* nix/libutil/util.cc (readFile, writeFile): Likewise.
Diffstat (limited to 'nix')
-rw-r--r-- | nix/libstore/build.cc | 2 | ||||
-rw-r--r-- | nix/libutil/hash.cc | 2 | ||||
-rw-r--r-- | nix/libutil/util.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 10a6093bd5..c5383bc756 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2576,7 +2576,7 @@ Path DerivationGoal::openLogFile() closeOnExec(fd); if (!(fLogFile = fdopen(fd.borrow(), "w"))) - throw SysError(format("opening file `%1%'") % logFileName); + throw SysError(format("opening log file `%1%'") % logFileName); int err; if (!(bzLogFile = BZ2_bzWriteOpen(&err, fLogFile, 9, 0, 0))) diff --git a/nix/libutil/hash.cc b/nix/libutil/hash.cc index 7853acdd49..9ba604eb85 100644 --- a/nix/libutil/hash.cc +++ b/nix/libutil/hash.cc @@ -244,7 +244,7 @@ Hash hashFile(HashType ht, const Path & path) start(ht, ctx); AutoCloseFD fd = open(path.c_str(), O_RDONLY); - if (fd == -1) throw SysError(format("opening file `%1%'") % path); + if (fd == -1) throw SysError(format("computing hash of file `%1%'") % path); unsigned char buf[8192]; ssize_t n; diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 4d3780e3c2..82eac72120 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -264,7 +264,7 @@ string readFile(const Path & path, bool drain) { AutoCloseFD fd = open(path.c_str(), O_RDONLY); if (fd == -1) - throw SysError(format("opening file `%1%'") % path); + throw SysError(format("reading file `%1%'") % path); return drain ? drainFD(fd) : readFile(fd); } @@ -273,7 +273,7 @@ void writeFile(const Path & path, const string & s) { AutoCloseFD fd = open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666); if (fd == -1) - throw SysError(format("opening file '%1%'") % path); + throw SysError(format("writing file '%1%'") % path); writeFull(fd, s); } |