[commit: Cabal] master: Check that there is a sanely named .cabal file after unpacking a code tarball. (182c165)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/182c165dd439186248b3405fbaab273e6d16df76

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

commit 182c165dd439186248b3405fbaab273e6d16df76
Author: bjorn <bjorn at bringert.net>
Date:   Sun Oct 7 12:54:57 2007 +0000

    Check that there is a sanely named .cabal file after unpacking a code tarball.

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

 .../src/Network/Hackage/CabalInstall/Install.hs    |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Install.hs b/cabal-install/src/Network/Hackage/CabalInstall/Install.hs
index 18cfeb5..43e5d18 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Install.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Install.hs
@@ -36,7 +36,7 @@ import Distribution.Simple.Compiler (Compiler(..))
 import Distribution.Simple.InstallDirs (InstallDirs(..), absoluteInstallDirs)
 import Distribution.Simple.SetupWrapper (setupWrapper)
 import Distribution.Simple.Setup (CopyDest(..))
-import Distribution.Package (showPackageId, PackageIdentifier)
+import Distribution.Package (showPackageId, PackageIdentifier(..))
 import Distribution.Verbosity
 
 
@@ -133,6 +133,9 @@ installPkg cfg comp globalArgs (pkg,ops,repo)
                   (removeDirectoryRecursive tmpDirPath)
                   (do message cfg deafening (printf "Extracting %s..." pkgPath)
                       extractTarGzFile (Just tmpDirPath) pkgPath
+                      let descFilePath = tmpDirPath </> showPackageId pkg </> pkgName pkg <.> "cabal"
+                      e <- doesFileExist descFilePath
+                      when (not e) $ fail $ "Package .cabal file not found: " ++ show descFilePath
                       installUnpackedPkg cfg pkg setup
                       return ())