lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Renamed id' -> name' to remove the implication of uniqueness.

Browse source
This commit is contained in:
Eelco Dolstra 2003-07-08 09:59:00 +00:00
parent 0b38b43bab
commit 85a913a3e7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fix.cc
View file

@ -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<string, ATerm>::iterator it = bndMap.begin();
@ -173,7 +173,7 @@ static Expr evalExpr(Expr e)
if (key == "build") builder = path;
}
else if (ATmatch(value, "<str>", &s1)) {
if (key == "id") id = s1;
if (key == "name") name = s1;
env = ATinsert(env,
ATmake("(<str>, <str>)", 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("(<str>, <str>)", "out", out.c_str()));