[commit: Cabal] master: Improve formatting of cabal check output (4c96ce1)
Ian Lynagh
igloo at earth.li
Fri Jun 24 02:03:35 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4c96ce141955720280631c7c47c001378fcf6769
>---------------------------------------------------------------
commit 4c96ce141955720280631c7c47c001378fcf6769
Author: Duncan Coutts <duncan at haskell.org>
Date: Wed Jun 3 10:22:54 2009 +0000
Improve formatting of cabal check output
>---------------------------------------------------------------
cabal-install/Distribution/Client/Check.hs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cabal-install/Distribution/Client/Check.hs b/cabal-install/Distribution/Client/Check.hs
index c9e8f5f..8d5fe23 100644
--- a/cabal-install/Distribution/Client/Check.hs
+++ b/cabal-install/Distribution/Client/Check.hs
@@ -25,7 +25,7 @@ import Distribution.PackageDescription.Configuration
import Distribution.Verbosity
( Verbosity )
import Distribution.Simple.Utils
- ( defaultPackageDesc, toUTF8 )
+ ( defaultPackageDesc, toUTF8, wrapText )
check :: Verbosity -> IO Bool
check verbosity = do
@@ -54,23 +54,19 @@ check verbosity = do
unless (null buildImpossible) $ do
putStrLn "The package will not build sanely due to these errors:"
- mapM_ (putStrLn . toUTF8. explanation) buildImpossible
- putStrLn ""
+ printCheckMessages buildImpossible
unless (null buildWarning) $ do
putStrLn "The following warnings are likely affect your build negatively:"
- mapM_ (putStrLn . toUTF8 . explanation) buildWarning
- putStrLn ""
+ printCheckMessages buildWarning
unless (null distSuspicious) $ do
putStrLn "These warnings may cause trouble when distributing the package:"
- mapM_ (putStrLn . toUTF8 . explanation) distSuspicious
- putStrLn ""
+ printCheckMessages distSuspicious
unless (null distInexusable) $ do
putStrLn "The following errors will cause portability problems on other environments:"
- mapM_ (putStrLn . toUTF8 . explanation) distInexusable
- putStrLn ""
+ printCheckMessages distInexusable
let isDistError (PackageDistSuspicious {}) = False
isDistError _ = True
@@ -83,3 +79,7 @@ check verbosity = do
putStrLn "No errors or warnings could be found in the package."
return (null packageChecks)
+
+ where
+ printCheckMessages = mapM_ (putStrLn . format . explanation)
+ format = toUTF8 . wrapText . ("* "++)
More information about the Cvs-libraries
mailing list