ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Make "opening file" error messages distinguishable.

Browse source 
* nix/libstore/build.cc (DerivationGoal::openLogFile): Customize
"opening file" error message.
* nix/libutil/hash.cc (hashFile): Likewise.
* nix/libutil/util.cc (readFile, writeFile): Likewise.
This commit is contained in:
Ludovic Courtès 2022-12-17 12:25:47 +01:00
parent 239bfe2ec1
commit 2d4d26769d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/libstore/build.cc
View file

@ -2576,7 +2576,7 @@ Path DerivationGoal::openLogFile()
closeOnExec(fd); closeOnExec(fd);
if (!(fLogFile = fdopen(fd.borrow(), "w"))) if (!(fLogFile = fdopen(fd.borrow(), "w")))
throw SysError(format("opening file `%1%'") % logFileName); throw SysError(format("opening log file `%1%'") % logFileName);
int err; int err;
if (!(bzLogFile = BZ2_bzWriteOpen(&err, fLogFile, 9, 0, 0))) if (!(bzLogFile = BZ2_bzWriteOpen(&err, fLogFile, 9, 0, 0)))

2
nix/libutil/hash.cc
View file

@ -244,7 +244,7 @@ Hash hashFile(HashType ht, const Path & path)
start(ht, ctx); start(ht, ctx);
AutoCloseFD fd = open(path.c_str(), O_RDONLY); 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]; unsigned char buf[8192];
ssize_t n; ssize_t n;

4
nix/libutil/util.cc
View file

@ -264,7 +264,7 @@ string readFile(const Path & path, bool drain)
{ {
AutoCloseFD fd = open(path.c_str(), O_RDONLY); AutoCloseFD fd = open(path.c_str(), O_RDONLY);
if (fd == -1) if (fd == -1)
throw SysError(format("opening file `%1%'") % path); throw SysError(format("reading file `%1%'") % path);
return drain ? drainFD(fd) : readFile(fd); 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); AutoCloseFD fd = open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666);
if (fd == -1) if (fd == -1)
throw SysError(format("opening file '%1%'") % path); throw SysError(format("writing file '%1%'") % path);
writeFull(fd, s); writeFull(fd, s);
} }