Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2557bc2dcbaa6fb6fda7feb42c326f41a94b47d5 >--------------------------------------------------------------- commit 2557bc2dcbaa6fb6fda7feb42c326f41a94b47d5 Author: Duncan Coutts <[email protected]> Date: Mon Dec 17 21:11:41 2007 +0000 Remove redundant parameters >--------------------------------------------------------------- cabal-install/Hackage/Fetch.hs | 4 ++-- cabal-install/Hackage/Info.hs | 4 ++-- cabal-install/Main.hs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cabal-install/Hackage/Fetch.hs b/cabal-install/Hackage/Fetch.hs index abcb76e..c3d84d0 100644 --- a/cabal-install/Hackage/Fetch.hs +++ b/cabal-install/Hackage/Fetch.hs @@ -123,8 +123,8 @@ fetchPackage cfg pkg downloadPackage cfg pkg -- |Fetch a list of packages and their dependencies. -fetch :: ConfigFlags -> Compiler -> ProgramConfiguration -> [String] -> [UnresolvedDependency] -> IO () -fetch cfg comp conf _globalArgs deps +fetch :: ConfigFlags -> Compiler -> ProgramConfiguration -> [UnresolvedDependency] -> IO () +fetch cfg comp conf deps = do depTree <- resolveDependencies cfg comp conf deps case packagesToInstall depTree of Left missing -> fail $ "Unresolved dependencies: " ++ showDependencies missing diff --git a/cabal-install/Hackage/Info.hs b/cabal-install/Hackage/Info.hs index 76b4456..d4b2120 100644 --- a/cabal-install/Hackage/Info.hs +++ b/cabal-install/Hackage/Info.hs @@ -26,8 +26,8 @@ import Distribution.Simple.Program (ProgramConfiguration) import Data.List (intersperse, nubBy) import Text.Printf (printf) -info :: ConfigFlags -> Compiler -> ProgramConfiguration -> [String] -> [UnresolvedDependency] -> IO () -info cfg comp conf _globalArgs deps +info :: ConfigFlags -> Compiler -> ProgramConfiguration -> [UnresolvedDependency] -> IO () +info cfg comp conf deps = do apkgs <- resolveDependencies cfg comp conf deps mapM_ (infoPkg cfg) $ flattenResolvedPackages apkgs case packagesToInstall apkgs of diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index c7f7ab2..5a705a5 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -143,7 +143,7 @@ infoAction flags extraArgs = do (comp, conf) <- findCompiler config case parsePackageArgs extraArgs of Left err -> putStrLn err >> exitWith (ExitFailure 1) - Right pkgs -> info config comp conf [] pkgs + Right pkgs -> info config comp conf pkgs listAction :: Cabal.Flag Verbosity -> Args -> IO () listAction flags extraArgs = do @@ -167,4 +167,4 @@ fetchAction flags extraArgs = do (comp, conf) <- findCompiler config case parsePackageArgs extraArgs of Left err -> putStrLn err >> exitWith (ExitFailure 1) - Right pkgs -> fetch config comp conf [] pkgs + Right pkgs -> fetch config comp conf pkgs _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
