[commit: Cabal] master: Couple of trivial code changes (8de90c5)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8de90c581d6b18ed52c2d923980b37eb0b5a393b

>---------------------------------------------------------------

commit 8de90c581d6b18ed52c2d923980b37eb0b5a393b
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Fri Jul 8 01:30:12 2011 +0000

    Couple of trivial code changes

>---------------------------------------------------------------

 cabal/Distribution/Simple.hs            |    1 -
 cabal/Distribution/Simple/PreProcess.hs |    8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cabal/Distribution/Simple.hs b/cabal/Distribution/Simple.hs
index b5a45ec..83ca516 100644
--- a/cabal/Distribution/Simple.hs
+++ b/cabal/Distribution/Simple.hs
@@ -394,7 +394,6 @@ hookedAction pre_hook cmd_hook post_hook get_build_config hooks flags args = do
    -- localbuildinfo?
    cmd_hook hooks pkg_descr localbuildinfo hooks flags
    post_hook hooks args flags pkg_descr localbuildinfo
-  where
 
 sanityCheckHookedBuildInfo :: PackageDescription -> HookedBuildInfo -> IO ()
 sanityCheckHookedBuildInfo PackageDescription { library = Nothing } (Just _,_)
diff --git a/cabal/Distribution/Simple/PreProcess.hs b/cabal/Distribution/Simple/PreProcess.hs
index 60170b8..1c16d09 100644
--- a/cabal/Distribution/Simple/PreProcess.hs
+++ b/cabal/Distribution/Simple/PreProcess.hs
@@ -191,15 +191,13 @@ preprocessComponent pd comp lbi isSrcDist verbosity handlers = case comp of
   (CExe exe at Executable { buildInfo = bi, exeName = nm }) -> do
     let exeDir = buildDir lbi </> nm </> nm ++ "-tmp"
         dirs   = hsSourceDirs bi ++ [autogenModulesDir lbi]
-    unless (null (executables pd)) $
-      setupMessage verbosity ("Preprocessing executable '" ++ nm ++ "' for") (packageId pd)
+    setupMessage verbosity ("Preprocessing executable '" ++ nm ++ "' for") (packageId pd)
     forM_ (map ModuleName.toFilePath $ otherModules bi) $
       pre dirs exeDir (localHandlers bi)
     pre (hsSourceDirs bi) exeDir (localHandlers bi) $
       dropExtensions (modulePath exe)
-  CTest test -> do
-    unless (null (testSuites pd)) $
-      setupMessage verbosity "Preprocessing test suites for" (packageId pd)
+  CTest test at TestSuite{ testName = nm } -> do
+    setupMessage verbosity ("Preprocessing test suite '" ++ nm ++ "' for") (packageId pd)
     case testInterface test of
       TestSuiteExeV10 _ f ->
           preProcessTest test f $ buildDir lbi </> testName test