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