Author: eelco
Date: Mon May 9 08:57:19 2011
New Revision: 27192
URL: https://svn.nixos.org/websvn/nix/?rev=27192&sc=1
Log:
* Revert r27114, it seems to break stuff.
Modified:
hydra/trunk/src/c/hydra_eval_jobs.cc
Modified: hydra/trunk/src/c/hydra_eval_jobs.cc
==============================================================================
--- hydra/trunk/src/c/hydra_eval_jobs.cc Sun May 8 22:02:43 2011
(r27191)
+++ hydra/trunk/src/c/hydra_eval_jobs.cc Mon May 9 08:57:19 2011
(r27192)
@@ -49,17 +49,13 @@
return;
}
- Formals::Formals_::iterator next = cur; ++next;
-
AutoArgs::const_iterator a = argsLeft.find(cur->name);
- if (a == argsLeft.end()) {
- if (!cur->def)
- throw TypeError(format("job `%1%' requires an argument named
`%2%'")
- % attrPath % cur->name);
- tryJobAlts(state, doc, argsUsed, argsLeft, attrPath, fun, next, last,
actualArgs);
- return;
- }
+ if (a == argsLeft.end())
+ throw TypeError(format("job `%1%' requires an argument named `%2%'")
+ % attrPath % cur->name);
+
+ Formals::Formals_::iterator next = cur; ++next;
int n = 0;
foreach (ValueList::const_iterator, i, a->second) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
