diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-01T12·52+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-01T12·52+0100 |
| commit | c4a40949d945b4a3be85ad68b8cfb449843f34a6 (patch) | |
| tree | 535f9679b01e677114e5ac947d7d4a7c88917cab /src/nix-store/nix-store.cc | |
| parent | 07808052461e9534dc42f7f98e83a7b58565fd13 (diff) | |
Handle importing NARs containing files greater than 4 GiB
Also templatize readInt() to work for various integer types.
Diffstat (limited to 'src/nix-store/nix-store.cc')
| -rw-r--r-- | src/nix-store/nix-store.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 0aabe66c5626..bd889c8515d9 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -839,7 +839,7 @@ static void opServe(Strings opFlags, Strings opArgs) settings.maxSilentTime = readInt(in); settings.buildTimeout = readInt(in); if (GET_PROTOCOL_MINOR(clientVersion) >= 2) - settings.maxLogSize = readInt(in); + in >> settings.maxLogSize; if (GET_PROTOCOL_MINOR(clientVersion) >= 3) { settings.set("build-repeat", std::to_string(readInt(in))); settings.set("enforce-determinism", readInt(in) != 0 ? "true" : "false"); |