Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/40ab50493cc329d878d6d61c9b1356b982a9839b >--------------------------------------------------------------- commit 40ab50493cc329d878d6d61c9b1356b982a9839b Author: Duncan Coutts <[email protected]> Date: Thu Jun 12 18:11:22 2008 +0000 Update to minor change in Cabal-1.4 and fix a warning. >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 2 +- cabal-install/Hackage/SrcDist.hs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 8b6bbdb..94c11c6 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -19,7 +19,7 @@ module Hackage.Dependency ( upgradableDependencies, ) where -import Hackage.Dependency.Naive (naiveResolver) +--import Hackage.Dependency.Naive (naiveResolver) import Hackage.Dependency.Bogus (bogusResolver) import Hackage.Dependency.TopDown (topDownResolver) import qualified Distribution.Simple.PackageIndex as PackageIndex diff --git a/cabal-install/Hackage/SrcDist.hs b/cabal-install/Hackage/SrcDist.hs index 56f686e..f7e411e 100644 --- a/cabal-install/Hackage/SrcDist.hs +++ b/cabal-install/Hackage/SrcDist.hs @@ -55,8 +55,10 @@ sdist flags = do setupMessage verbosity "Building source dist for" (packageId pkg) if snapshot then getClockTime >>= toCalendarTime - >>= prepareSnapshotTree verbosity pkg mb_lbi tmpDir knownSuffixHandlers - else prepareTree verbosity pkg mb_lbi tmpDir knownSuffixHandlers + >>= prepareSnapshotTree verbosity pkg mb_lbi + distPref tmpDir knownSuffixHandlers + else prepareTree verbosity pkg mb_lbi + distPref tmpDir knownSuffixHandlers targzFile <- createArchive verbosity pkg tmpDir distPref notice verbosity $ "Source tarball created: " ++ targzFile _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
