[Pkg-haskell-commits] darcs: darcs-monitor: Fix patch

[Joachim Breitner]

Sat May 18 14:03:58 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Fix patch
  Ignore-this: a3c4c4dd6b56b9a612a8d6dcefe9328f

    M ./patches/catch -6 +12

Sat May 18 14:03:58 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Fix patch
  Ignore-this: a3c4c4dd6b56b9a612a8d6dcefe9328f
diff -rN -u old-darcs-monitor//patches/catch new-darcs-monitor//patches/catch
--- old-darcs-monitor//patches/catch	2013-05-18 14:04:36.726038690 +0000
+++ new-darcs-monitor//patches/catch	2013-05-18 14:04:36.742040887 +0000
@@ -1,14 +1,16 @@
 Description: Use Control.Exception.catch
 Author: Joachim Breitner <nomeata at debian.org>
 
---- darcs-monitor-0.4.2.orig/darcs-monitor.hs
-+++ darcs-monitor-0.4.2/darcs-monitor.hs
+Index: darcs-monitor-0.4.2/darcs-monitor.hs
+===================================================================
+--- darcs-monitor-0.4.2.orig/darcs-monitor.hs	2013-05-18 15:43:35.000000000 +0200
++++ darcs-monitor-0.4.2/darcs-monitor.hs	2013-05-18 16:02:25.847617172 +0200
 @@ -1,3 +1,4 @@
 +{-# LANGUAGE ScopedTypeVariables #-}
  {-  darcs-monitor - Darcs repository monitor
      Copyright © 2007 Antti-Juhani Kaijanaho
      Copyright © 2007 Benja Fallenstein
-@@ -36,6 +37,7 @@ import System.Exit
+@@ -36,6 +37,7 @@
  import System.IO
  import Text.XML.HaXml hiding (when,version,x,tag,cdata)
  import Text.XML.HaXml.Posn
@@ -16,11 +18,15 @@
  
  import Config
  import Darcs
-@@ -184,7 +186,7 @@ readSeenPatches :: MonadIO m => String -
+@@ -182,9 +184,9 @@
+ 
+ readSeenPatches :: MonadIO m => String -> m SeenPatches
  readSeenPatches repo =
-   liftIO $ catch (do fc <- readFile (repo ++ seenPatchesFileName)
-                      return (read fc)
+-  liftIO $ catch (do fc <- readFile (repo ++ seenPatchesFileName)
+-                     return (read fc)
 -                 ) $ \_ -> return Map.empty
++  liftIO $ Control.Exception.catch (do fc <- readFile (repo ++ seenPatchesFileName)
++                                       return (read fc)
 +                 ) $ \(_::IOException) -> return Map.empty