Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/da57bd076848c596b4f0a9598b12c66c68a354e3 >--------------------------------------------------------------- commit da57bd076848c596b4f0a9598b12c66c68a354e3 Author: Duncan Coutts <[email protected]> Date: Fri Feb 22 00:03:23 2008 +0000 Use exitFailure rather than exitWith (ExitFailure 1) and instead of exitWith ExitSuccess just return through main rather than throwing an exception >--------------------------------------------------------------- cabal-install/Main.hs | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index 28b83fb..313c926 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -40,7 +40,7 @@ import Distribution.Version (showVersion) import qualified Paths_cabal_install (version) import System.Environment (getArgs, getProgName) -import System.Exit (exitWith, ExitCode(..)) +import System.Exit (exitFailure) import Data.List (intersperse) import Data.Monoid (Monoid(..)) import Control.Monad (unless) @@ -70,7 +70,7 @@ mainWorker args = printOptionsList = putStr . unlines printErrors errs = do putStr (concat (intersperse "\n" errs)) - exitWith (ExitFailure 1) + exitFailure printNumericVersion = putStrLn $ showVersion Paths_cabal_install.version printVersion = putStrLn $ "cabal-install version " ++ showVersion Paths_cabal_install.version @@ -203,6 +203,4 @@ checkAction verbosityFlag extraArgs = do unless (null extraArgs) $ do die $ "'check' doesn't take any extra arguments: " ++ unwords extraArgs allOk <- Check.check (fromFlag verbosityFlag) - if allOk - then exitWith ExitSuccess - else exitWith (ExitFailure 1) + unless allOk exitFailure _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
