wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Pass all settings to build-remote

Browse source 
This ensures that command line flags such as --builders get passed
correctly.
This commit is contained in:
Eelco Dolstra 2017-10-23 20:43:04 +02:00
parent f32cdc4fab
commit 37fbfffd8e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 75 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libutil/serialise.hh
View file

@ -92,7 +92,17 @@ struct FdSink : BufferedSink
FdSink() : fd(-1) { }
FdSink(int fd) : fd(fd) { }
FdSink(FdSink&&) = default;
FdSink& operator=(FdSink&&) = default;
FdSink& operator=(FdSink && s)
{
flush();
fd = s.fd;
s.fd = -1;
warn = s.warn;
written = s.written;
return *this;
}
~FdSink();
void write(const unsigned char * data, size_t len) override;
@ -112,6 +122,16 @@ struct FdSource : BufferedSource
FdSource() : fd(-1) { }
FdSource(int fd) : fd(fd) { }
FdSource(FdSource&&) = default;
FdSource& operator=(FdSource && s)
{
fd = s.fd;
s.fd = -1;
read = s.read;
return *this;
}
size_t readUnbuffered(unsigned char * data, size_t len) override;
bool good() override;
private: