Workaround for RemoteStore not supporting cmdBuildDerivation yet

This commit is contained in:
Eelco Dolstra 2015-07-31 03:39:20 +02:00
parent 706746d4bf
commit 5b9a288123

View file

@ -156,8 +156,9 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
unsigned int version = readInt(from); unsigned int version = readInt(from);
if (GET_PROTOCOL_MAJOR(version) != 0x200) if (GET_PROTOCOL_MAJOR(version) != 0x200)
throw Error(format("unsupported nix-store --serve protocol version on %1%") % machine->sshName); throw Error(format("unsupported nix-store --serve protocol version on %1%") % machine->sshName);
if (GET_PROTOCOL_MINOR(version) >= 1) if (GET_PROTOCOL_MINOR(version) >= 1 && machine->sshName != "localhost") // FIXME
sendDerivation = false; sendDerivation = false;
} catch (EndOfFile & e) { } catch (EndOfFile & e) {
child.pid.wait(true); child.pid.wait(true);