From e080af3daa92ce6b51a09fbb69b0aedb8d08bce2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 May 2011 08:57:19 +0000 Subject: [PATCH] * Revert r27114, it seems to break stuff. --- src/c/hydra_eval_jobs.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/c/hydra_eval_jobs.cc b/src/c/hydra_eval_jobs.cc index c7de83f5..0618d923 100644 --- a/src/c/hydra_eval_jobs.cc +++ b/src/c/hydra_eval_jobs.cc @@ -49,17 +49,13 @@ static void tryJobAlts(EvalState & state, XMLWriter & doc, 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) {