diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-08 09:59:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-08 09:59:00 +0000 |
| commit | 85a913a3e78e43f7f90ef46ac041350bb5d61d1f (patch) | |
| tree | 6b1352f3392636f91f671397b3f2776dd6f9a5a9 | |
| parent | 0b38b43bab28dd733e057d42853d57e44ec9a7c9 (diff) | |
* Renamed `id' -> `name' to remove the implication of uniqueness.
| -rw-r--r-- | src/fix.cc | 10 |
1 files 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<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())); |