diff --git a/src/Ganeti/Curl/Multi.hs b/src/Ganeti/Curl/Multi.hs index 6f08a00bef442554a0abb6c6e5fb02f66217892b..d096502833dbfa34e5f4ec4418d5e5dec107fed9 100644 --- a/src/Ganeti/Curl/Multi.hs +++ b/src/Ganeti/Curl/Multi.hs @@ -191,7 +191,7 @@ makeEasyHandle (f, e, (opts, url)) = do execMultiCall :: [([CurlOption], String)] -> IO [(CurlCode, String)] execMultiCall ous = do -- error buffers - errorbufs <- mapM (\_ -> mallocErrorBuffer) ous + errorbufs <- mapM (const mallocErrorBuffer) ous -- result buffers outbufs <- mapM (\_ -> newIORef []) ous -- handles diff --git a/src/Ganeti/HTools/Program/Hscan.hs b/src/Ganeti/HTools/Program/Hscan.hs index 38829cdc2b77d3bb21e075c73e1b09d6ecfd51e1..ddc811a719d08176ebc4c23c0f8b89de6f389d91 100644 --- a/src/Ganeti/HTools/Program/Hscan.hs +++ b/src/Ganeti/HTools/Program/Hscan.hs @@ -159,4 +159,4 @@ main opts clusters = do results <- mapM (\name -> Rapi.loadData name >>= writeData nlen name opts) clusters - unless (all id results) $ exitWith (ExitFailure 2) + unless (and results) $ exitWith (ExitFailure 2)