mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realiseContext: Handle all context types

Browse source 
Avoids an assertion
This commit is contained in:
Shea Levy 2014-11-15 21:43:51 -05:00
parent 3d604ac88c
commit 2719627bbe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops.cc
View file

@ -35,7 +35,7 @@ std::pair<string, string> decodeContext(const string & s)
size_t index = s.find("!", 1); size_t index = s.find("!", 1);
return std::pair<string, string>(string(s, index + 1), string(s, 1, index - 1)); return std::pair<string, string>(string(s, index + 1), string(s, 1, index - 1));
} else } else
return std::pair<string, string>(s, ""); return std::pair<string, string>(s.at(0) == '/' ? s: string(s, 1), "");
} }
@ -51,7 +51,7 @@ void realiseContext(const PathSet & context)
assert(isStorePath(ctx)); assert(isStorePath(ctx));
if (!store->isValidPath(ctx)) if (!store->isValidPath(ctx))
throw InvalidPathError(ctx); throw InvalidPathError(ctx);
if (isDerivation(ctx)) if (!decoded.second.empty() && isDerivation(ctx))
drvs.insert(decoded.first + "!" + decoded.second); drvs.insert(decoded.first + "!" + decoded.second);
} }
if (!drvs.empty()) { if (!drvs.empty()) {