[commit: Cabal] master: Remove redundant code an re-enable accidentally disabled code (f2a67dd)

[Paolo Capriotti]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f2a67dd1d24b7675b5865e33e00f843f55345f0b

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

commit f2a67dd1d24b7675b5865e33e00f843f55345f0b
Author: Duncan Coutts <duncan at haskell.org>
Date:   Thu Jan 10 18:01:37 2008 +0000

    Remove redundant code an re-enable accidentally disabled code

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

 cabal-install/Hackage/Install.hs |   21 ---------------------
 cabal-install/Main.hs            |    2 +-
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs
index af0efc3..6b2fca7 100644
--- a/cabal-install/Hackage/Install.hs
+++ b/cabal-install/Hackage/Install.hs
@@ -164,24 +164,3 @@ installUnpackedPkg verbosity configFlags mpath
         = do debug verbosity $
                "setupWrapper in " ++ show mpath ++ " :\n " ++ show cmds
              setupWrapper cmds mpath
-
-{-
--- Attach the correct prefix flag to configure commands,
--- correct --user flag to install commands and no options to other commands.
-mkPkgOps :: ConfigFlags -> Cabal.ConfigFlags -> [String]
-mkPkgOps cfg configFlags =
-  commandShowOptions (Cabal.configureCommand defaultProgramConfiguration) configFlags {
-    Cabal.configHcFlavor  = toFlag (configCompiler cfg),
-    Cabal.configHcPath    = maybe (Cabal.configHcPath configFlags)
-                                  toFlag (configCompilerPath cfg),
-    Cabal.configHcPkg     = maybe (Cabal.configHcPkg configFlags)
-                                  toFlag (configHcPkgPath cfg),
-    Cabal.configInstallDirs = fmap (maybe mempty toFlag) installDirTemplates,
-    Cabal.configVerbose   = toFlag (configVerbose cfg),
-    Cabal.configPackageDB = if configUserInstall cfg
-                              then toFlag UserPackageDB
-                              else toFlag GlobalPackageDB
-  }
- where installDirTemplates | configUserInstall cfg = configUserInstallDirs cfg
-                           | otherwise             = configGlobalInstallDirs cfg
--}
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index ed284f6..a48d77e 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -81,7 +81,7 @@ mainWorker args =
       ,infoCommand            `commandAddAction` infoAction
       ,listCommand            `commandAddAction` listAction
       ,updateCommand          `commandAddAction` updateAction
---      ,upgradeCommand          `commandAddActionWithEmptyFlags` upgradeAction
+      ,upgradeCommand          `commandAddActionWithEmptyFlags` upgradeAction
       ,fetchCommand           `commandAddAction` fetchAction
       ,uploadCommand          `commandAddAction` uploadAction