Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/3656fd032744945f0c7b79c5b669bb00fd568017 >--------------------------------------------------------------- commit 3656fd032744945f0c7b79c5b669bb00fd568017 Author: bjorn <[email protected]> Date: Sun Oct 7 08:46:18 2007 +0000 Untabify the rest of the code. >--------------------------------------------------------------- .../src/Network/Hackage/CabalInstall/BuildDep.hs | 2 +- .../src/Network/Hackage/CabalInstall/Config.hs | 2 +- .../src/Network/Hackage/CabalInstall/Fetch.hs | 2 +- .../src/Network/Hackage/CabalInstall/Setup.hs | 4 ++-- .../src/Network/Hackage/CabalInstall/Types.hs | 6 +++--- .../src/Network/Hackage/CabalInstall/Utils.hs | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cabal-install/src/Network/Hackage/CabalInstall/BuildDep.hs b/cabal-install/src/Network/Hackage/CabalInstall/BuildDep.hs index ac9e063..576e5b3 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/BuildDep.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/BuildDep.hs @@ -29,7 +29,7 @@ buildDep :: ConfigFlags -> [String] -> [UnresolvedDependency] -> IO () buildDep cfg globalArgs deps = do ipkgs <- listInstalledPackages cfg apkgs <- fmap getPackages (fmap (getBuildDeps ipkgs) - (resolveDependenciesAux cfg ipkgs deps)) + (resolveDependenciesAux cfg ipkgs deps)) installPackages cfg globalArgs apkgs -- | Takes the path to a .cabal file, and installs the build-dependencies listed there. diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs index 2fa22c6..97cfca9 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs @@ -34,7 +34,7 @@ import Data.Char (isAlphaNum, toLower) import Data.List (intersperse) import Data.Maybe (mapMaybe, fromMaybe) import System.Directory (Permissions (..), getPermissions, createDirectoryIfMissing - ,getTemporaryDirectory) + ,getTemporaryDirectory) import System.IO.Error (isDoesNotExistError) import System.IO (hPutStrLn, stderr) import System.IO.Unsafe diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Fetch.hs b/cabal-install/src/Network/Hackage/CabalInstall/Fetch.hs index e99b949..920abe3 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Fetch.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Fetch.hs @@ -71,7 +71,7 @@ downloadURI path uri Left err -> return (Just err) Right rsp | rspCode rsp == (2,0,0) -> withBinaryFile path WriteMode (`hPutStr` rspBody rsp) - >> return Nothing + >> return Nothing | otherwise -> return (Just (ErrorMisc ("Invalid HTTP code: " ++ show (rspCode rsp)))) where request = Request uri GET [] "" diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs index 970481b..c06fb2e 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs @@ -88,8 +88,8 @@ configFromOptions = foldr f OptCacheDir d -> cfg { configCacheDir = d } OptPrefix d -> lib (\ds x -> ds { prefixDirTemplate = x }) d OptBinDir d -> lib (\ds x -> ds { binDirTemplate = x }) d - OptLibDir d -> lib (\ds x -> ds { libDirTemplate = x }) d - OptLibSubDir d -> lib (\ds x -> ds { libSubdirTemplate = x }) d + OptLibDir d -> lib (\ds x -> ds { libDirTemplate = x }) d + OptLibSubDir d -> lib (\ds x -> ds { libSubdirTemplate = x }) d OptLibExecDir d -> lib (\ds x -> ds { libexecDirTemplate = x }) d OptDataDir d -> lib (\ds x -> ds { dataDirTemplate = x }) d OptDataSubDir d -> lib (\ds x -> ds { dataSubdirTemplate = x }) d diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs index 4a7e847..f263ea7 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs @@ -50,9 +50,9 @@ data Option = OptCompilerFlavor CompilerFlavor | OptLibSubDir FilePath | OptLibExecDir FilePath | OptDataDir FilePath - | OptDataSubDir FilePath - | OptDocDir FilePath - | OptHtmlDir FilePath + | OptDataSubDir FilePath + | OptDocDir FilePath + | OptHtmlDir FilePath | OptUserInstall Bool | OptHelp | OptVerbose Verbosity diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Utils.hs b/cabal-install/src/Network/Hackage/CabalInstall/Utils.hs index 78227de..1cbb958 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Utils.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Utils.hs @@ -44,9 +44,9 @@ parseBasicStanza fields empty inp = readFields inp >>= foldM (setField fields) empty setField :: [FieldDescr a] - -> a - -> Field - -> ParseResult a + -> a + -> Field + -> ParseResult a setField fs x (F line f val) = case lookupFieldDescr fs f of Nothing -> _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
