[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 22fcc39833faeabe67b895e9d72300c1aa09b3b6
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Oct 27 02:28:43 2004 +0100

    Checkpointing again
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-11)

diff --git a/ChangeLog b/ChangeLog
index bb0158c..6d683ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-10-26 20:28:43 GMT	John Goerzen <jgoerzen at complete.org>	patch-11
+
+    Summary:
+      Checkpointing again
+    Revision:
+      missingh--head--0.5--patch-11
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Cmd.hs
+     libsrc/MissingH/Email/Sendmail.hs
+
+
 2004-10-26 20:21:29 GMT	John Goerzen <jgoerzen at complete.org>	patch-10
 
     Summary:
diff --git a/libsrc/MissingH/Cmd.hs b/libsrc/MissingH/Cmd.hs
index 8f13a7d..38a17cf 100644
--- a/libsrc/MissingH/Cmd.hs
+++ b/libsrc/MissingH/Cmd.hs
@@ -152,4 +152,3 @@ pOpen3 pin pout perr fp args func =
            Just (Exited (ExitFailure fc)) -> cmdfailed fp args fc
            Just (Terminated sig) -> fail ("Command terminated by signal" ++ show sig)
            Just (Stopped sig) -> fail ("Command stopped by signal" ++ show sig)
-        return retval
\ No newline at end of file
diff --git a/libsrc/MissingH/Email/Sendmail.hs b/libsrc/MissingH/Email/Sendmail.hs
index 4c0d565..581f594 100644
--- a/libsrc/MissingH/Email/Sendmail.hs
+++ b/libsrc/MissingH/Email/Sendmail.hs
@@ -85,10 +85,12 @@ sendmail_worker args msg =
     let func h = hPutStr h msg
         in
         do
-        pOpen WriteToPipe "/usr/sbin/sendmail" args func
-        
-        catch (pOpen WriteToPipe "sendmail" args func) 
-                  (\_ -> do
-                         sn <- findsendmail
-                         pOpen WriteToPipe sn args func)
-
+        --pOpen WriteToPipe "/usr/sbin/sendmail" args func
+        rv <- try (pOpen WriteToPipe "sendmail" args func)
+        case rv of
+            Right x -> return x
+            Left _ -> do
+                      sn <- findsendmail
+                      rv <- pOpen WriteToPipe sn args func
+                      return $! rv
+                         

-- 
haskell-testpack