[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 7b245361b024670138ddc3fb1f8147e57bf54cef
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Oct 27 02:20:50 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index 51fd788..1b13d52 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:20:50 GMT	John Goerzen <jgoerzen at complete.org>	patch-9
+
+    Summary:
+      Checkpointing again
+    Revision:
+      missingh--head--0.5--patch-9
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Cmd.hs
+     libsrc/MissingH/Email/Sendmail.hs
+
+
 2004-10-26 20:13:17 GMT	John Goerzen <jgoerzen at complete.org>	patch-8
 
     Summary:
diff --git a/libsrc/MissingH/Cmd.hs b/libsrc/MissingH/Cmd.hs
index e0419b8..951a0e5 100644
--- a/libsrc/MissingH/Cmd.hs
+++ b/libsrc/MissingH/Cmd.hs
@@ -155,6 +155,7 @@ pOpen3 pin pout perr fp args func =
         pid <- forkProcess childstuff
         putStrLn "Parent 138"
         retval <- func
+        seq retval (return ())
         putStrLn "Parent 140"
         status <- getProcessStatus True False pid
         putStrLn "Parent 142"
@@ -164,4 +165,4 @@ 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)
-           
\ No newline at end of file
+        return retval
\ No newline at end of file
diff --git a/libsrc/MissingH/Email/Sendmail.hs b/libsrc/MissingH/Email/Sendmail.hs
index cc83a43..e46566f 100644
--- a/libsrc/MissingH/Email/Sendmail.hs
+++ b/libsrc/MissingH/Email/Sendmail.hs
@@ -82,10 +82,7 @@ sendmail (Just from) recipients msg =
     
 sendmail_worker :: [String] -> String -> IO ()
 sendmail_worker args msg =
-    let func h = do
-                 print "I am the func!"
-                 hPutStr h msg
-                 print "Func ending!"
+    let func h = hPutStr h msg
         in
         do
         pOpen WriteToPipe "/usr/sbin/sendmail" args func

-- 
haskell-testpack