On Fri, Jun 19, 2015 at 01:14:28PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
Signed-off-by: Klaus Aehlig <[email protected]> --- src/Ganeti/Query/Query.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/src/Ganeti/Query/Query.hs b/src/Ganeti/Query/Query.hs index 9979858..09cadf9 100644 --- a/src/Ganeti/Query/Query.hs +++ b/src/Ganeti/Query/Query.hs @@ -228,14 +228,14 @@ genericQuery fieldsMap collector nameFn configFn getFn cfg -- Run the first pass of the filter, without a runtime context; this will -- limit the objects that we'll contact for exports fobjects <- toError $ - filterM (\n -> evaluateQueryFilter cfg Nothing n cfilter) objects + filterM (\n -> evaluateFilter cfg Nothing n cfilter) objects -- Gather the runtime data and filter the results again, -- based on the gathered data runtimes <- (case collector of CollectorSimple collFn -> lift $ collFn live' cfg fobjects CollectorFieldAware collFn -> lift $ collFn live' cfg fields fobjects) >>= (toError . filterM (\(obj, runtime) -> - evaluateQueryFilter cfg (Just runtime) obj cfilter)) + evaluateFilter cfg (Just runtime) obj cfilter)) let fdata = map (\(obj, runtime) -> map (execGetter cfg runtime obj) fgetters) runtimes -- 2.4.3.573.g4eafbef
LGTM
