From 63b8f09d8d8532e67009b7233f8f81e9326353ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Dec 2008 10:45:47 +0000 Subject: [PATCH] --- src/libexpr/primops.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 989a68682..dce56c9a2 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -590,10 +590,11 @@ static Expr prim_toFile(EvalState & state, const ATermVector & args) PathSet refs; for (PathSet::iterator i = context.begin(); i != context.end(); ++i) { - if (isDerivation(*i)) + Path path = *i; + if (path.at(0) == '=') path = string(path, 1); + if (isDerivation(path)) throw EvalError(format("in `toFile': the file `%1%' cannot refer to derivation outputs") % name); - /* !!! */ - refs.insert(*i); + refs.insert(path); } Path storePath = readOnlyMode