nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

Browse source
This commit is contained in:
Wouter den Breejen 2007-07-10 09:23:42 +00:00
parent b378df6484
commit ba437f451e
3 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/primops.cc
View file

@ -641,19 +641,6 @@ static Expr prim_derivationStrict(EvalState & state, const ATermVector & args)
printMsg(lvlChatty, format("instantiated `%1%' -> `%2%'") % drvName % drvPath); printMsg(lvlChatty, format("instantiated `%1%' -> `%2%'") % drvName % drvPath);
//printMsg(lvlError, format("PRIMOPS %1%") % drvPath);
/* Write updated (no need to rebuild) state derivations to the database, so they can be updated at build time
if(enableState && !disableState){
if(store->isValidPath(outPath)){ //Only add when the path is already valid
Path deriver = queryDeriver(noTxn, outPath); //query the deriver
if(deriver != drvPath){
store->addUpdatedStateDerivation(drvPath, outPath);
}
}
}
*/
/* Optimisation, but required in read-only mode! because in that /* Optimisation, but required in read-only mode! because in that
case we don't actually write store expressions, so we can't case we don't actually write store expressions, so we can't
read them later. */ read them later. */

2
src/libstore/local-store.cc
View file

@ -631,7 +631,7 @@ void setDeriver(const Transaction & txn, const Path & storePath, const Path & de
if (!isRealisablePath(txn, storePath)) if (!isRealisablePath(txn, storePath))
throw Error(format("path `%1%' is not valid") % storePath); throw Error(format("path `%1%' is not valid") % storePath);
printMsg(lvlError, format("Ttttttttttttttttttttttttt %1%") % deriver); //printMsg(lvlError, format("Ttttttttttttttttttttttttt %1%") % deriver);
if (isStateDrvPathTxn(txn, deriver)){ //Redirect if its a state component //hanges somtimes !!!!!!!!!!!!!!!!!!! if (isStateDrvPathTxn(txn, deriver)){ //Redirect if its a state component //hanges somtimes !!!!!!!!!!!!!!!!!!!
addStateDeriver(txn, storePath, deriver); addStateDeriver(txn, storePath, deriver);

3
src/libstore/store-api.cc
View file

@ -146,8 +146,7 @@ void checkStatePath(const Derivation & drv)
string stateIdentifier = drv.stateOutputs.find("state")->second.stateIdentifier; string stateIdentifier = drv.stateOutputs.find("state")->second.stateIdentifier;
Path calculatedPath = makeStatePath(componentHash, suffix, stateIdentifier); Path calculatedPath = makeStatePath(componentHash, suffix, stateIdentifier);
printMsg(lvlError, format("CHECK: %1% %2%") % drvPath % calculatedPath); printMsg(lvlError, format("Checking statePath validity: %1% %2%") % drvPath % calculatedPath);
if(drvPath != calculatedPath) if(drvPath != calculatedPath)
Error(format("The statepath from the Derivation does not match the recalculated statepath, are u trying to spoof the statepath?")); Error(format("The statepath from the Derivation does not match the recalculated statepath, are u trying to spoof the statepath?"));