Revert 97c6a72.

That commit prevented 'sdist' from printing distribution quality warnings.
sheyll · Oct 30, 2014 · 1f41dbf · 1f41dbf
1 parent ee6e478
commit 1f41dbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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