diff options
author | Shea Levy <shea@shealevy.com> | 2014-11-16T02·43-0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-11-16T02·43-0500 |
commit | 2719627bbe4001b172e1b54ca7c300593675bf3f (patch) | |
tree | 9ea6d013a6977aadf0f7e80c918a7d492c1d9ed0 /src/libexpr/primops.cc | |
parent | 3d604ac88c81dd9b22252c7437a717b077897b13 (diff) |
realiseContext: Handle all context types
Avoids an assertion
Diffstat (limited to '')
-rw-r--r-- | src/libexpr/primops.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 50d03f369bf9..6203a11a6b53 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -35,7 +35,7 @@ std::pair<string, string> decodeContext(const string & s) size_t index = s.find("!", 1); return std::pair<string, string>(string(s, index + 1), string(s, 1, index - 1)); } 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)); if (!store->isValidPath(ctx)) throw InvalidPathError(ctx); - if (isDerivation(ctx)) + if (!decoded.second.empty() && isDerivation(ctx)) drvs.insert(decoded.first + "!" + decoded.second); } if (!drvs.empty()) { |