diff --git a/Cabal/Distribution/Simple/SrcDist.hs b/Cabal/Distribution/Simple/SrcDist.hs index 7cd65a794e82a9e5936b43a80df9a49ebcde4a34..7e4308cb9007ef2907c7a5134b3332180bc143c2 100644 --- a/Cabal/Distribution/Simple/SrcDist.hs +++ b/Cabal/Distribution/Simple/SrcDist.hs @@ -57,7 +57,7 @@ import Distribution.Simple.Utils , installOrdinaryFiles, installMaybeExecutableFiles , findFile, findFileWithExtension, matchFileGlob , withTempDirectory, defaultPackageDesc - , die, warn, notice, setupMessage ) + , die, warn, notice, info, setupMessage ) import Distribution.Simple.Setup ( Flag(..), SDistFlags(..) , fromFlag, flagToMaybe) import Distribution.Simple.PreProcess ( PPSuffixHandler, ppSuffixes @@ -113,7 +113,7 @@ sdist pkg mb_lbi flags mkTmpDir pps = case flagToMaybe (sDistDirectory flags) of Just targetDir -> do generateSourceDir targetDir pkg' - notice verbosity $ "Source directory created: " ++ targetDir + info verbosity $ "Source directory created: " ++ targetDir Nothing -> do createDirectoryIfMissingVerbose verbosity True tmpTargetDir diff --git a/cabal-install/Distribution/Client/SrcDist.hs b/cabal-install/Distribution/Client/SrcDist.hs index ab700b4340f519093a3f2d61396823df280bffc7..437ef838bcdd4ee93f355759ea864445de763812 100644 --- a/cabal-install/Distribution/Client/SrcDist.hs +++ b/cabal-install/Distribution/Client/SrcDist.hs @@ -29,7 +29,7 @@ import Distribution.Simple.BuildPaths ( srcPref) import Distribution.Simple.Program (requireProgram, simpleProgram, programPath) import Distribution.Simple.Program.Db (emptyProgramDb) import Distribution.Text ( display ) -import Distribution.Verbosity (Verbosity, lessVerbose, normal) +import Distribution.Verbosity (Verbosity) import Distribution.Version (Version(..), orLaterVersion) import System.FilePath ((</>), (<.>)) @@ -53,9 +53,6 @@ sdist flags exflags = do let outDir = if isOutDirectory then tmpDir else tmpDir </> tarBallName pkg flags' = (if not needMakeArchive then flags else flags { sDistDirectory = Flag outDir }) - { sDistVerbosity = Flag $ if verbosity == normal - then lessVerbose verbosity - else verbosity } unless isListSources $ createDirectoryIfMissingVerbose verbosity True outDir