From: simonmar Date: Thu, 8 Mar 2001 11:44:16 +0000 (+0000) Subject: [project @ 2001-03-08 11:44:16 by simonmar] X-Git-Tag: Approximately_9120_patches~2451 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=41d0a61d29cb0daccbcdbf96a339c06c5aa140a4;p=ghc-hetmet.git [project @ 2001-03-08 11:44:16 by simonmar] remove cyclic dependency --- diff --git a/ghc/compiler/main/PackageMaintenance.hs b/ghc/compiler/main/PackageMaintenance.hs index a233057..365b8ac 100644 --- a/ghc/compiler/main/PackageMaintenance.hs +++ b/ghc/compiler/main/PackageMaintenance.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: PackageMaintenance.hs,v 1.8 2001/03/08 09:50:18 simonmar Exp $ +-- $Id: PackageMaintenance.hs,v 1.9 2001/03/08 11:44:16 simonmar Exp $ -- -- GHC Driver program -- @@ -13,8 +13,7 @@ module PackageMaintenance import CmStaticInfo import DriverState -import DriverUtil -import DriverFlags ( runSomething ) +import TmpFiles import Panic import Exception @@ -84,7 +83,7 @@ maybeRestoreOldConfig conf_file io hPutStr stdout "\nWARNING: an error was encountered while the new \n\ \configuration was being written. Attempting to \n\ \restore the old configuration... " - runSomething ("cp " ++ conf_file ++ ".old " ++ conf_file) "Restoring old configuration" + kludgedSystem ("cp " ++ conf_file ++ ".old " ++ conf_file) "Restoring old configuration" hPutStrLn stdout "done." throw e ) @@ -104,7 +103,7 @@ savePackageConfig conf_file = do -- mv rather than cp because we've already done an hGetContents -- on this file so we won't be able to open it for writing -- unless we move the old one out of the way... - runSomething ("mv " ++ conf_file ++ " " ++ conf_file ++ ".old") "Saving package configuration" + kludgedSystem ("mv " ++ conf_file ++ " " ++ conf_file ++ ".old") "Saving package configuration" hPutStrLn stdout "done." -----------------------------------------------------------------------------