[commit: Cabal] master: Update new cabal init code for the recent package id changes (52fac63)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/52fac63fcb82eb7f035c08b7dc3742615853dc16

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

commit 52fac63fcb82eb7f035c08b7dc3742615853dc16
Author: Duncan Coutts <duncan at haskell.org>
Date:   Wed Oct 28 13:20:37 2009 +0000

    Update new cabal init code for the recent package id changes

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

 .../Distribution/Client/Init/Heuristics.hs         |    2 +-
 cabal-install/Distribution/Client/Setup.hs         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Init/Heuristics.hs b/cabal-install/Distribution/Client/Init/Heuristics.hs
index c5d8542..ba19cf0 100644
--- a/cabal-install/Distribution/Client/Init/Heuristics.hs
+++ b/cabal-install/Distribution/Client/Init/Heuristics.hs
@@ -20,7 +20,7 @@ module Distribution.Client.Init.Heuristics (
 ) where
 import Distribution.Simple.Setup(Flag(..))
 import Distribution.ModuleName ( ModuleName, fromString )
-import Distribution.Simple.PackageIndex
+import Distribution.Client.PackageIndex
     ( allPackagesByName )
 import qualified Distribution.PackageDescription as PD
     ( category, packageDescription )
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index a5139ce..73d3530 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -818,7 +818,7 @@ initCommand = CommandUI {
   }
   where readMaybe s = case reads s of
                         [(x,"")]  -> Just x
-                        otherwise -> Nothing
+                        _         -> Nothing
 
 -- ------------------------------------------------------------
 -- * GetOpt Utils