maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The 'insert output between = signs' approach was not helpful

Browse source
This commit is contained in:
Shea Levy 2011-11-06 06:28:14 +00:00
parent f883afa1a1
commit 981edeab7b
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops.cc
View file

@ -456,7 +456,7 @@ static void prim_derivationStrict(EvalState & state, Value * * args, Value & v)
state.mkAttrs(v, 1 + drv.outputs.size()); state.mkAttrs(v, 1 + drv.outputs.size());
foreach (DerivationOutputs::iterator, i, drv.outputs) { foreach (DerivationOutputs::iterator, i, drv.outputs) {
mkString(*state.allocAttr(v, state.symbols.create(i->first + "DrvPath")), drvPath, singleton<PathSet>("=" + i->first + "=" + drvPath)); mkString(*state.allocAttr(v, state.symbols.create(i->first + "DrvPath")), drvPath, singleton<PathSet>("=" + drvPath));
/* The output path of an output X is ‘<X>Path’, /* The output path of an output X is ‘<X>Path’,
e.g. ‘outPath’. */ e.g. ‘outPath’. */
mkString(*state.allocAttr(v, state.symbols.create(i->first + "Path")), mkString(*state.allocAttr(v, state.symbols.create(i->first + "Path")),
@ -974,14 +974,7 @@ static void prim_unsafeDiscardOutputDependency(EvalState & state, Value * * args
PathSet context2; PathSet context2;
foreach (PathSet::iterator, i, context) { foreach (PathSet::iterator, i, context) {
Path p = *i; Path p = *i;
if (p.at(0) == '=') p = "~" + string(p, 1);
{
size_t index;
p = "~" + string(p, 1);
index = p.find("=");
if (index < p.find("/"))
p = "~" + string(p, index + 1);
}
context2.insert(p); context2.insert(p);
} }