[commit: Cabal] : Misc minor tweaks in Main (f806b14)
Ian Lynagh
igloo at earth.li
Fri Jun 24 02:06:09 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch :
http://hackage.haskell.org/trac/ghc/changeset/f806b14ff9e0b113afe8aa322a24bbf24b71d250
>---------------------------------------------------------------
commit f806b14ff9e0b113afe8aa322a24bbf24b71d250
Author: Duncan Coutts <duncan at haskell.org>
Date: Mon May 10 03:27:36 2010 +0000
Misc minor tweaks in Main
>---------------------------------------------------------------
cabal-install/Main.hs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 2629817..29158e4 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -11,7 +11,7 @@
-- Entry point to the default cabal-install front-end.
-----------------------------------------------------------------------------
-module Main where
+module Main (main) where
import Distribution.Client.Setup
( GlobalFlags(..), globalCommand, globalRepos
@@ -112,9 +112,7 @@ mainWorker args = topHandler $
putStr $ "\nYou can edit the cabal configuration file to set defaults:\n"
++ " " ++ configFile ++ "\n"
printOptionsList = putStr . unlines
- printErrors errs = do
- putStr (concat (intersperse "\n" errs))
- exitFailure
+ printErrors errs = die $ concat (intersperse "\n" errs)
printNumericVersion = putStrLn $ display Paths_cabal_install.version
printVersion = putStrLn $ "cabal-install version "
++ display Paths_cabal_install.version
@@ -351,6 +349,8 @@ initAction :: InitFlags -> [String] -> GlobalFlags -> IO ()
initAction flags _extraArgs _globalFlags = do
initCabal flags
+-- | See 'Distribution.Client.Install.withWin32SelfUpgrade' for details.
+--
win32SelfUpgradeAction :: [String] -> IO ()
win32SelfUpgradeAction (pid:path:rest) =
Win32SelfUpgrade.deleteOldExeFile verbosity (read pid) path
More information about the Cvs-libraries
mailing list