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

Small fix

Browse source
This commit is contained in:
Wouter den Breejen 2007-05-21 21:56:34 +00:00
parent 5cac336820
commit 802d7f40bd
6 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations-ast.def
View file

@ -7,7 +7,7 @@ Derive | ATermList ATermList ATermList ATermList ATermList string string ATermLi
| string string | ATerm | EnvBinding |
| string ATermList | ATerm | DerivationInput |
| string string string string | ATerm | DerivationOutput |
| string string string string string string string | ATerm | DerivationStateOutput |
| string string string string string string string string | ATerm | DerivationStateOutput |
| string string string | ATerm | DerivationStateOutputDir |
Closure | ATermList ATermList | ATerm | OldClosure |

8
src/libstore/derivations.cc
View file

@ -85,8 +85,8 @@ Derivation parseDerivation(ATerm t)
//parse state part
for (ATermIterator i(stateOuts); i; ++i) {
ATerm id, statepath, hashAlgo, hash, enabled, shared, synchronization;
if (!matchDerivationStateOutput(*i, id, statepath, hashAlgo, hash, enabled, shared, synchronization))
ATerm id, statepath, hashAlgo, hash, enabled, shared, synchronization, createDirsBeforeInstall;
if (!matchDerivationStateOutput(*i, id, statepath, hashAlgo, hash, enabled, shared, synchronization, createDirsBeforeInstall))
throwBadDrv(t);
DerivationStateOutput stateOut;
stateOut.statepath = aterm2String(statepath);
@ -96,6 +96,7 @@ Derivation parseDerivation(ATerm t)
stateOut.enabled = aterm2String(enabled);
stateOut.shared = aterm2String(shared);
stateOut.synchronization = aterm2String(synchronization);
stateOut.createDirsBeforeInstall = aterm2String(createDirsBeforeInstall);
drv.stateOutputs[aterm2String(id)] = stateOut;
}
@ -168,7 +169,8 @@ ATerm unparseDerivation(const Derivation & drv)
toATerm(i->second.hash),
toATerm(i->second.enabled),
toATerm(i->second.shared),
toATerm(i->second.synchronization)
toATerm(i->second.synchronization),
toATerm(i->second.createDirsBeforeInstall)
));
ATermList stateOutputDirs = ATempty;

6
src/libstore/derivations.hh
View file

@ -41,11 +41,11 @@ struct DerivationStateOutput
string enabled;
string shared;
string synchronization;
string createStateDirsBeforeInstall;
string createDirsBeforeInstall;
DerivationStateOutput()
{
}
DerivationStateOutput(Path statepath, string hashAlgo, string hash, string enabled, string shared, string synchronization, string createStateDirsBeforeInstall)
DerivationStateOutput(Path statepath, string hashAlgo, string hash, string enabled, string shared, string synchronization, string createDirsBeforeInstall)
{
this->statepath = statepath;
this->hashAlgo = hashAlgo;
@ -53,7 +53,7 @@ struct DerivationStateOutput
this->enabled = enabled;
this->shared = shared;
this->synchronization = synchronization;
this->createStateDirsBeforeInstall = createStateDirsBeforeInstall;
this->createDirsBeforeInstall = createDirsBeforeInstall;
}
};