[commit: Cabal] master: Removed the unused configPkgListDir. (765f355)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/765f35586cc500d5059cbc28af3f7eab0f88983d

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

commit 765f35586cc500d5059cbc28af3f7eab0f88983d
Author: bjorn <bjorn at bringert.net>
Date:   Sat Oct 6 10:12:46 2007 +0000

    Removed the unused configPkgListDir.

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

 .../src/Network/Hackage/CabalInstall/Config.hs     |    4 ----
 .../src/Network/Hackage/CabalInstall/Configure.hs  |    6 +-----
 .../src/Network/Hackage/CabalInstall/Setup.hs      |    3 ---
 .../src/Network/Hackage/CabalInstall/Types.hs      |    2 --
 4 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
index 8a426b2..e9b1c7f 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
@@ -18,7 +18,6 @@ module Network.Hackage.CabalInstall.Config
     , getDefaultConfigDir
     , getLocalConfigDir
     , getLocalCacheDir
-    , getLocalPkgListDir
     , getKnownServers
     , getKnownPackages
     , selectValidConfigDir
@@ -64,9 +63,6 @@ getLocalConfigDir
 getLocalCacheDir :: IO FilePath
 getLocalCacheDir = getLocalConfigDir
 
-getLocalPkgListDir :: IO FilePath
-getLocalPkgListDir = getLocalConfigDir
-
 pkgListFile :: FilePath
 pkgListFile = "pkg.list"
 
diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs b/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs
index 7729a0c..f8b1ba5 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs
@@ -21,7 +21,7 @@ import Network.Hackage.CabalInstall.Types (ConfigFlags (..), OutputGen (..)
                                       , TempFlags (..), ResolvedPackage (..))
 import Network.Hackage.CabalInstall.Config
          (getDefaultConfigDir, getLocalConfigDir, getLocalCacheDir,
-          getLocalPkgListDir, getKnownServers, selectValidConfigDir)
+          getKnownServers, selectValidConfigDir)
 import Network.Hackage.CabalInstall.Fetch (pkgURL)
 
 import qualified Distribution.Simple.Configure as Configure (configCompiler)
@@ -121,22 +121,18 @@ mkConfigFlags cfg
          defaultConfigDir <- getDefaultConfigDir
          localConfigDir   <- getLocalConfigDir
          localCacheDir    <- getLocalCacheDir
-         localPkgListDir  <- getLocalPkgListDir
          confDir <- selectValidConfigDir ( maybe id (:) (tempConfDir cfg)
                                            [localConfigDir, defaultConfigDir] )
          let cacheDir   = fromMaybe localCacheDir   (tempCacheDir cfg)
-             pkgListDir = fromMaybe localPkgListDir (tempPkgListDir cfg)
          when (verbosity > normal) $ do
              printf "Using config dir: %s\n" confDir
              printf "Using cache dir: %s\n" cacheDir
-             printf "Using pkglist dir: %s\n" pkgListDir
          outputGen <- defaultOutputGen (tempVerbose cfg)
          let config = ConfigFlags
                       { configCompiler    = comp
 		      , configPrograms    = conf'''
                       , configConfDir     = confDir
                       , configCacheDir    = cacheDir
-                      , configPkgListDir  = pkgListDir
                       , configPrefix      = prefix
                       , configServers     = []
                       , configTarPath     = programPath tarProg
diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs
index 61e9554..cc5cdbf 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs
@@ -36,7 +36,6 @@ emptyTempFlags = TempFlags {
         tempHcPath      = Nothing,
         tempConfDir     = Nothing,
         tempCacheDir    = Nothing,
-        tempPkgListDir  = Nothing,
         tempHcPkg       = Nothing,
         tempPrefix      = Nothing,
         tempRunHc       = Nothing,
@@ -65,8 +64,6 @@ globalOptions =
                  ("override the path to the config dir.")
     , Option "" ["cache-dir"] (ReqArg (\path t -> t { tempCacheDir = Just path }) "PATH")
                  ("override the path to the package cache dir.")
-    , Option "" ["pkglist-dir"] (ReqArg (\path t -> t { tempPkgListDir = Just path }) "PATH")
-                 ("override the path to the package list dir.")
     , Option "" ["tar-path"] (ReqArg (\path t -> t { tempTarPath = Just path }) "PATH")
                  "give the path to tar"
     , Option "w" ["with-compiler"] (ReqArg (\path t -> t { tempHcPath = Just path }) "PATH")
diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs
index 7c28b8a..2616abe 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs
@@ -44,7 +44,6 @@ data TempFlags = TempFlags {
         tempHcPath      :: Maybe FilePath, -- ^given compiler location
         tempConfDir     :: Maybe FilePath,
         tempCacheDir    :: Maybe FilePath,
-        tempPkgListDir  :: Maybe FilePath,
         tempHcPkg       :: Maybe FilePath, -- ^given hc-pkg location
         tempPrefix      :: Maybe FilePath,
         tempTarPath     :: Maybe FilePath,
@@ -60,7 +59,6 @@ data ConfigFlags = ConfigFlags {
 	configPrograms    :: ProgramConfiguration,
         configConfDir     :: FilePath,
         configCacheDir    :: FilePath,
-        configPkgListDir  :: FilePath,
         configPrefix      :: Maybe FilePath,
         configServers     :: [Repo],       -- ^Available Hackage servers.
         configTarPath     :: FilePath,