libstore: parse the buildMode instead of unchecked cast
Change-Id: Icf6af7935e8f139bef36b40ad475e973aa48855c
This commit is contained in:
parent
076c19e0d1
commit
2a7a824d83
3 changed files with 14 additions and 3 deletions
|
@ -527,7 +527,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
|
|||
auto drvs = WorkerProto::Serialise<DerivedPaths>::read(*store, rconn);
|
||||
BuildMode mode = bmNormal;
|
||||
if (GET_PROTOCOL_MINOR(clientVersion) >= 15) {
|
||||
mode = (BuildMode) readInt(from);
|
||||
mode = buildModeFromInteger(readInt(from));
|
||||
|
||||
/* Repairing is not atomic, so disallowed for "untrusted"
|
||||
clients.
|
||||
|
@ -551,7 +551,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
|
|||
case WorkerProto::Op::BuildPathsWithResults: {
|
||||
auto drvs = WorkerProto::Serialise<DerivedPaths>::read(*store, rconn);
|
||||
BuildMode mode = bmNormal;
|
||||
mode = (BuildMode) readInt(from);
|
||||
mode = buildModeFromInteger(readInt(from));
|
||||
|
||||
/* Repairing is not atomic, so disallowed for "untrusted"
|
||||
clients.
|
||||
|
@ -582,7 +582,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
|
|||
* correctly.
|
||||
*/
|
||||
readDerivation(from, *store, drv, Derivation::nameFromPath(drvPath));
|
||||
BuildMode buildMode = (BuildMode) readInt(from);
|
||||
BuildMode buildMode = buildModeFromInteger(readInt(from));
|
||||
logger->startWork();
|
||||
|
||||
auto drvType = drv.type();
|
||||
|
|
|
@ -22,6 +22,14 @@ using json = nlohmann::json;
|
|||
|
||||
namespace nix {
|
||||
|
||||
BuildMode buildModeFromInteger(int raw) {
|
||||
switch (raw) {
|
||||
case bmNormal: return bmNormal;
|
||||
case bmRepair: return bmRepair;
|
||||
case bmCheck: return bmCheck;
|
||||
default: throw Error("Invalid BuildMode");
|
||||
}
|
||||
}
|
||||
|
||||
bool Store::isInStore(PathView path) const
|
||||
{
|
||||
|
|
|
@ -90,6 +90,9 @@ const uint32_t exportMagic = 0x4558494e;
|
|||
|
||||
|
||||
enum BuildMode { bmNormal, bmRepair, bmCheck };
|
||||
/** Checks that a build mode is a valid one, then returns it */
|
||||
BuildMode buildModeFromInteger(int);
|
||||
|
||||
enum TrustedFlag : bool { NotTrusted = false, Trusted = true };
|
||||
|
||||
struct BuildResult;
|
||||
|
|
Loading…
Reference in a new issue