diff --git a/cabal-install/Hackage/Fetch.hs b/cabal-install/Hackage/Fetch.hs index 8b9b0b697b26c0db4c1fa3ccce4fe42b1116ed06..3ba17c3781c9975af0e7e6baf8131ed290af6cbb 100644 --- a/cabal-install/Hackage/Fetch.hs +++ b/cabal-install/Hackage/Fetch.hs @@ -116,7 +116,7 @@ fetchPackage :: ConfigFlags -> PkgInfo -> IO String fetchPackage cfg pkg = do fetched <- isFetched cfg pkg if fetched - then do printf "'%s' is present.\n" (showPackageId (pkgInfoId pkg)) + then do printf "'%s' is cached.\n" (showPackageId (pkgInfoId pkg)) return (packageFile cfg pkg) else do printf "Downloading '%s'...\n" (showPackageId (pkgInfoId pkg)) downloadPackage cfg pkg diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs index e011dd259918f86bd15a5ec84fc7e43a7c8c1325..f48a84d526e576dc14b7f6964f6025e7d8d7553c 100644 --- a/cabal-install/Hackage/Install.hs +++ b/cabal-install/Hackage/Install.hs @@ -150,15 +150,9 @@ installUnpackedPkg :: ConfigFlags -> Compiler -> Maybe FilePath -- ^ Directory to change to before starting the installation. -> IO () installUnpackedPkg cfg comp globalArgs pkgId opts mpath - = do printf "Building '%s'\n" (showPackageId pkgId) - printf " Configuring...\n" - setup "configure" - printf " Building...\n" + = do setup "configure" setup "build" - printf " Installing...\n" setup "install" - printf " Done.\n" - return () where setup cmd = do let cmdOps = mkPkgOps cfg comp pkgId cmd (globalArgs++opts)