1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs
index b000a00..d9177c6 100644
--- a/Ganeti/HTools/CLI.hs
+++ b/Ganeti/HTools/CLI.hs
@@ -74,11 +74,11 @@ module Ganeti.HTools.CLI
import Data.Maybe (fromMaybe)
import qualified Data.Version
-import Monad
+import Control.Monad
import System.Console.GetOpt
import System.IO
import System.Info
-import System
+import System.Exit
import Text.Printf (printf)
import qualified Ganeti.HTools.Version as Version(version)
diff --git a/Ganeti/HTools/ExtLoader.hs b/Ganeti/HTools/ExtLoader.hs
index 0412c1b..17b8449 100644
--- a/Ganeti/HTools/ExtLoader.hs
+++ b/Ganeti/HTools/ExtLoader.hs
@@ -36,10 +36,11 @@ module Ganeti.HTools.ExtLoader
) where
import Data.Maybe (isJust, fromJust)
-import Monad
+import Control.Monad
+import qualified Control.Exception as E
import System.FilePath
import System.IO
-import System
+import System.Exit
import Text.Printf (printf, hPrintf)
import qualified Ganeti.HTools.Luxi as Luxi
@@ -56,8 +57,8 @@ import Ganeti.HTools.CLI
import Ganeti.HTools.Utils (sepSplit, tryRead)
-- | Error beautifier
-wrapIO :: IO (Result a) -> IO (Result a)
-wrapIO = flip catch (return . Bad . show)
+wrapIO :: (Show a) => IO (Result a) -> IO (Result a)
+wrapIO = flip (E.catch :: IO a -> (E.IOException -> IO a) -> IO a) (return . Bad . show )
parseUtilisation :: String -> Result (String, DynUtil)
parseUtilisation line =
diff --git a/hail.hs b/hail.hs
index 541e1a9..68f4488 100644
--- a/hail.hs
+++ b/hail.hs
@@ -27,10 +27,10 @@ module Main (main) where
import Data.List
import Data.Maybe (isJust, fromJust)
-import Monad
-import System (exitWith, ExitCode(..))
+import Control.Monad
+import System.Environment
+import System.Exit
import System.IO
-import qualified System
import qualified Ganeti.HTools.Cluster as Cluster
@@ -99,7 +99,7 @@ readRequest opts args = do
-- | Main function.
main :: IO ()
main = do
- cmd_args <- System.getArgs
+ cmd_args <- getArgs
(opts, args) <- parseOpts cmd_args "hail" options
let shownodes = optShowNodes opts
diff --git a/hbal.hs b/hbal.hs
index 46cccf8..0254008 100644
--- a/hbal.hs
+++ b/hbal.hs
@@ -30,12 +30,12 @@ import Control.Exception (bracket)
import Data.List
import Data.Maybe (isJust, isNothing, fromJust)
import Data.IORef
-import Monad
-import System (exitWith, ExitCode(..))
+import Control.Monad
import System.IO
+import System.Exit
import System.Posix.Process
import System.Posix.Signals
-import qualified System
+import System.Environment
import Text.Printf (printf, hPrintf)
@@ -223,7 +223,7 @@ runJobSet master fin_nl il cmd_jobs = do
-- | Main function.
main :: IO ()
main = do
- cmd_args <- System.getArgs
+ cmd_args <- getArgs
(opts, args) <- parseOpts cmd_args "hbal" options
unless (null args) $ do
diff --git a/hscan.hs b/hscan.hs
index c14846f..d613f83 100644
--- a/hscan.hs
+++ b/hscan.hs
@@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
module Main (main) where
import Data.Maybe (isJust, fromJust, fromMaybe)
-import Monad
-import System (exitWith, ExitCode(..))
+import Control.Monad
+import System.Environment
+import System.Exit
import System.IO
import System.FilePath
-import qualified System
import Text.Printf (printf)
@@ -135,7 +135,7 @@ writeDataInner nlen name opts cdata fixdata = do
-- | Main function.
main :: IO ()
main = do
- cmd_args <- System.getArgs
+ cmd_args <- getArgs
(opts, clusters) <- parseOpts cmd_args "hscan" options
let local = "LOCAL"
diff --git a/hspace.hs b/hspace.hs
index 57d0302..f207c67 100644
--- a/hspace.hs
+++ b/hspace.hs
@@ -29,10 +29,10 @@ import Data.Char (toUpper, isAlphaNum)
import Data.List
import Data.Maybe (isJust, fromJust)
import Data.Ord (comparing)
-import Monad
-import System (exitWith, ExitCode(..))
+import Control.Monad
+import System.Exit
+import System.Environment
import System.IO
-import qualified System
import Text.Printf (printf, hPrintf)
@@ -207,7 +207,7 @@ printAllocationMap verbose msg nl ixes =
-- | Main function.
main :: IO ()
main = do
- cmd_args <- System.getArgs
+ cmd_args <- getArgs
(opts, args) <- parseOpts cmd_args "hspace" options
unless (null args) $ do
diff --git a/test.hs b/test.hs
index 12aa50d..81838eb 100644
--- a/test.hs
+++ b/test.hs
@@ -29,7 +29,7 @@ import Data.IORef
import Test.QuickCheck.Batch
import System.IO
import System.Exit
-import System (getArgs)
+import System.Environment (getArgs)
import Ganeti.HTools.QC
|
