[Pkg-ganeti-devel] [ganeti] 01/06: Drop dependency on MonadCatchIO-transformers

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch ghc8
in repository ganeti.

commit fe1a01c729d9c4468af0d70ba52a534888c1ddce
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Nov 21 12:23:53 2016 +0200

    Drop dependency on MonadCatchIO-transformers
    
    It has been deprecated upstream[1] and is no longer part of Debian
    unstable. Drop the dependency and patch the code to use
    Control.Exception.catch instead.
    
    [1] https://hackage.haskell.org/package/MonadCatchIO-transformers-0.3.1.3/docs/Control-Monad-CatchIO.html
    
    Closes: #844970
---
 ...p-dependency-on-MonadCatchIO-transformers.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
new file mode 100644
index 0000000..7674da1
--- /dev/null
+++ b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
@@ -0,0 +1,51 @@
+From 42512bbf83b74e12bfb05f619645a99528680d0a Mon Sep 17 00:00:00 2001
+From: Apollon Oikonomopoulos <apoikos at gmail.com>
+Date: Mon, 21 Nov 2016 12:21:19 +0200
+Subject: [PATCH] Drop dependency on MonadCatchIO-transformers
+
+MonadCatchIO-transformers is deprecated and has been removed from Debian
+unstable. Replace it with Control.Exception.
+---
+ cabal/ganeti.template.cabal   | 1 -
+ src/Ganeti/Metad/WebServer.hs | 6 +++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/cabal/ganeti.template.cabal
++++ b/cabal/ganeti.template.cabal
+@@ -65,7 +65,6 @@
+     , lens                          >= 3.10
+     , lifted-base                   >= 0.2.0.3    && < 0.3
+     , monad-control                 >= 0.3.1.3    && < 1.1
+-    , MonadCatchIO-transformers     >= 0.3.0.0    && < 0.4
+     , network                       >= 2.3.0.13   && < 2.7
+     , parallel                      >= 3.2.0.2    && < 3.3
+     , regex-pcre                    >= 0.94.2     && < 0.95
+--- a/src/Ganeti/Metad/WebServer.hs
++++ b/src/Ganeti/Metad/WebServer.hs
+@@ -39,7 +39,7 @@
+ import Control.Concurrent (MVar, readMVar)
+ import Control.Monad.Error.Class (MonadError, catchError, throwError)
+ import Control.Monad.IO.Class (liftIO)
+-import qualified Control.Monad.CatchIO as CatchIO (catch)
++import qualified Control.Exception as Exception (catch)
+ import qualified Data.CaseInsensitive as CI
+ import Data.List (intercalate)
+ import Data.Map (Map)
+@@ -105,7 +105,7 @@
+      maybeResult (JSON.readJSON instParams >>=
+                   Config.getPublicOsParams >>=
+                   getOsPackage) $ \package ->
+-       serveFile package `CatchIO.catch` \err ->
++       serveFile package `Exception.catch` \err ->
+          throwError $ "Could not serve OS package: " ++ show (err :: IOError)
+   where getOsPackage osParams =
+           case lookup key (JSON.fromJSObject osParams) of
+@@ -130,7 +130,7 @@
+           throwError $ "Could not find OS script " ++ show (os </> script)
+         serveScript os (d:ds) =
+           serveFile (d </> os </> script)
+-          `CatchIO.catch`
++          `Exception.catch`
+           \err -> do let _ = err :: IOError
+                      serveScript os ds
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0dfc233..65c8990 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ zlib-0.6-compatibility
 fix_FTBFS_with_sphinx-1.3.5
 fix_ftbfs_with_sphinx_1.4
 use-proper-cabal-dev.patch
+0001-Drop-dependency-on-MonadCatchIO-transformers.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git