From 85a913a3e78e43f7f90ef46ac041350bb5d61d1f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jul 2003 09:59:00 +0000 Subject: [PATCH] * Renamed `id' -> `name' to remove the implication of uniqueness. --- src/fix.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fix.cc b/src/fix.cc index 0797362fd..87ce7c775 100644 --- a/src/fix.cc +++ b/src/fix.cc @@ -156,7 +156,7 @@ static Expr evalExpr(Expr e) /* Gather information for building the Derive expression. */ ATermList ins = ATempty, env = ATempty; - string builder, id; + string builder, name; bnds = ATempty; for (map::iterator it = bndMap.begin(); @@ -173,7 +173,7 @@ static Expr evalExpr(Expr e) if (key == "build") builder = path; } else if (ATmatch(value, "", &s1)) { - if (key == "id") id = s1; + if (key == "name") name = s1; env = ATinsert(env, ATmake("(, )", key.c_str(), s1)); } @@ -191,10 +191,10 @@ static Expr evalExpr(Expr e) if (builder == "") throw badTerm("no builder specified", nf); - if (id == "") - throw badTerm("no package identifier specified", nf); + if (name == "") + throw badTerm("no package name specified", nf); - string out = nixStore + "/" + ((string) hash).c_str() + "-" + id; + string out = nixStore + "/" + ((string) hash).c_str() + "-" + name; env = ATinsert(env, ATmake("(, )", "out", out.c_str()));