[commit: Cabal] master: Revert to ordinary read/writeFile for the config file (9278fef)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9278fef9c15ef010b7a197a32e4c473d1b356945

>---------------------------------------------------------------

commit 9278fef9c15ef010b7a197a32e4c473d1b356945
Author: Duncan Coutts <duncan at haskell.org>
Date:   Thu Feb 28 10:59:14 2008 +0000

    Revert to ordinary read/writeFile for the config file

>---------------------------------------------------------------

 cabal-install/Hackage/Config.hs |    8 ++++----
 cabal-install/Hackage/Utils.hs  |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs
index 1d6b7e3..a9c624f 100644
--- a/cabal-install/Hackage/Config.hs
+++ b/cabal-install/Hackage/Config.hs
@@ -41,8 +41,8 @@ import Distribution.Verbosity (Verbosity, normal)
 
 import Hackage.Types (RemoteRepo(..), Repo(..), Username, Password)
 import Hackage.ParseUtils
-import Hackage.Utils (readTextFileIfExists)
-import Distribution.Simple.Utils (notice, warn, writeTextFile)
+import Hackage.Utils (readFileIfExists)
+import Distribution.Simple.Utils (notice, warn)
 
 
 --
@@ -159,7 +159,7 @@ defaultRemoteRepo =
 loadConfig :: Verbosity -> FilePath -> IO SavedConfig
 loadConfig verbosity configFile = 
     do defaultConf <- defaultSavedConfig
-       minp <- readTextFileIfExists configFile
+       minp <- readFileIfExists configFile
        case minp of
          Nothing -> do notice verbosity $ "Config file " ++ configFile ++ " not found."
                        notice verbosity $ "Writing default configuration to " ++ configFile
@@ -179,7 +179,7 @@ loadConfig verbosity configFile =
 writeDefaultConfigFile :: FilePath -> SavedConfig -> IO ()
 writeDefaultConfigFile file cfg = 
     do createDirectoryIfMissing True (takeDirectory file)
-       writeTextFile file $ showFields configWriteFieldDescrs cfg ++ "\n"
+       writeFile file $ showFields configWriteFieldDescrs cfg ++ "\n"
 
 showConfig :: SavedConfig -> String
 showConfig = showFields configFieldDescrs
diff --git a/cabal-install/Hackage/Utils.hs b/cabal-install/Hackage/Utils.hs
index e09d61f..5974151 100644
--- a/cabal-install/Hackage/Utils.hs
+++ b/cabal-install/Hackage/Utils.hs
@@ -2,16 +2,16 @@ module Hackage.Utils where
 
 import Distribution.ParseUtils (showDependency)
 import Distribution.Version (Dependency(..))
-import Distribution.Simple.Utils (intercalate, readTextFile)
+import Distribution.Simple.Utils (intercalate)
 
 import Control.Monad (guard)
 import Control.Exception (Exception, catchJust, ioErrors)
 import System.IO.Error (isDoesNotExistError)
 
-readTextFileIfExists :: FilePath -> IO (Maybe String)
-readTextFileIfExists path =
+readFileIfExists :: FilePath -> IO (Maybe String)
+readFileIfExists path =
     catchJust fileNotFoundExceptions 
-                  (fmap Just (readTextFile path))
+                  (fmap Just (readFile path))
                   (\_ -> return Nothing)
 
 fileNotFoundExceptions :: Exception -> Maybe IOError