Fix unused imports for ghc 6.12

GHC 6.12 has become more picky about unused imports, so we need to
remove/tighten some of them.

diff --git a/Ganeti/HTools/Luxi.hs b/Ganeti/HTools/Luxi.hs
index 4463683..fc7da13 100644 (file)
--- a/Ganeti/HTools/Luxi.hs
+++ b/Ganeti/HTools/Luxi.hs
@@ -28,9 +28,7 @@ module Ganeti.HTools.Luxi
       loadData
     ) where
 
-import Data.List
 import qualified Control.Exception as E
-import Control.Monad
 import Text.JSON.Types
 
 import qualified Ganeti.Luxi as L

diff --git a/Ganeti/HTools/PeerMap.hs b/Ganeti/HTools/PeerMap.hs
index 27e9938..a101dd1 100644 (file)
--- a/Ganeti/HTools/PeerMap.hs
+++ b/Ganeti/HTools/PeerMap.hs
@@ -43,7 +43,6 @@ module Ganeti.HTools.PeerMap
 import Data.Maybe (fromMaybe)
 import Data.List
 import Data.Function
-import Data.Ord
 
 import Ganeti.HTools.Types
 

diff --git a/Ganeti/HTools/Rapi.hs b/Ganeti/HTools/Rapi.hs
index 623baeb..a0367b7 100644 (file)
--- a/Ganeti/HTools/Rapi.hs
+++ b/Ganeti/HTools/Rapi.hs
@@ -30,8 +30,6 @@ module Ganeti.HTools.Rapi
 
 import Network.Curl
 import Network.Curl.Types ()
-import Network.Curl.Code
-import Data.List
 import Control.Monad
 import Text.JSON (JSObject, JSValue, fromJSObject, decodeStrict)
 import Text.JSON.Types (JSValue(..))

diff --git a/Ganeti/HTools/Simu.hs b/Ganeti/HTools/Simu.hs
index d822168..81c5768 100644 (file)
--- a/Ganeti/HTools/Simu.hs
+++ b/Ganeti/HTools/Simu.hs
@@ -30,7 +30,6 @@ module Ganeti.HTools.Simu
       loadData
     ) where
 
-import Control.Monad
 import Text.Printf (printf)
 
 import Ganeti.HTools.Utils

diff --git a/Ganeti/HTools/Utils.hs b/Ganeti/HTools/Utils.hs
index 66498db..e7f63b3 100644 (file)
--- a/Ganeti/HTools/Utils.hs
+++ b/Ganeti/HTools/Utils.hs
@@ -42,7 +42,6 @@ module Ganeti.HTools.Utils
     ) where
 
 import Data.List
-import Control.Monad
 import qualified Text.JSON as J
 import Text.Printf (printf)
 

diff --git a/Ganeti/Luxi.hs b/Ganeti/Luxi.hs
index 0468a4d..26ca7f6 100644 (file)
--- a/Ganeti/Luxi.hs
+++ b/Ganeti/Luxi.hs
@@ -33,10 +33,9 @@ module Ganeti.Luxi
     , queryJobsStatus
     ) where
 
-import Data.List
 import Data.IORef
 import Control.Monad
-import Text.JSON (JSObject, JSValue, toJSObject, encodeStrict, decodeStrict)
+import Text.JSON (encodeStrict, decodeStrict)
 import qualified Text.JSON as J
 import Text.JSON.Types
 import System.Timeout

diff --git a/Ganeti/OpCodes.hs b/Ganeti/OpCodes.hs
index ca2d8f4..53c97a1 100644 (file)
--- a/Ganeti/OpCodes.hs
+++ b/Ganeti/OpCodes.hs
@@ -29,9 +29,8 @@ module Ganeti.OpCodes
     , opID
     ) where
 
-import Data.List
 import Control.Monad
-import Text.JSON (JSObject, JSValue, readJSON, showJSON, makeObj, JSON)
+import Text.JSON (readJSON, showJSON, makeObj, JSON)
 import qualified Text.JSON as J
 import Text.JSON.Types
 

diff --git a/hail.hs b/hail.hs
index 8af889b..886b071 100644 (file)
--- a/hail.hs
+++ b/hail.hs
@@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 module Main (main) where
 
 import Data.List
-import Data.Function
 import Data.Maybe (isJust, fromJust)
 import Monad
-import System
+import System (exitWith, ExitCode(..))
 import System.IO
 import qualified System
 

diff --git a/hbal.hs b/hbal.hs
index 529a643..635fc3c 100644 (file)
--- a/hbal.hs
+++ b/hbal.hs
@@ -28,10 +28,9 @@ module Main (main) where
 import Control.Concurrent (threadDelay)
 import Control.Exception (bracket)
 import Data.List
-import Data.Function
 import Data.Maybe (isJust, fromJust)
 import Monad
-import System
+import System (exitWith, ExitCode(..))
 import System.IO
 import qualified System
 

diff --git a/hscan.hs b/hscan.hs
index f36758b..44985ae 100644 (file)
--- a/hscan.hs
+++ b/hscan.hs
@@ -28,10 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 module Main (main) where
 
 import Data.List
-import Data.Function
 import Data.Maybe (isJust, fromJust)
 import Monad
-import System
+#ifdef NO_CURL
+import System (exitWith, ExitCode(..))
+#endif
 import System.IO
 import System.FilePath
 import qualified System

diff --git a/hspace.hs b/hspace.hs
index d55762c..4292888 100644 (file)
--- a/hspace.hs
+++ b/hspace.hs
@@ -30,7 +30,7 @@ import Data.List
 import Data.Function
 import Data.Maybe (isJust, fromJust)
 import Monad
-import System
+import System (exitWith, ExitCode(..))
 import System.IO
 import qualified System