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

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

diff --git a/ChangeLog b/ChangeLog
index 1b13d52..bb0158c 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:21:29 GMT	John Goerzen <jgoerzen at complete.org>	patch-10
+
+    Summary:
+      Checkpointing again
+    Revision:
+      missingh--head--0.5--patch-10
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Cmd.hs
+     libsrc/MissingH/Email/Sendmail.hs
+
+
 2004-10-26 20:20:50 GMT	John Goerzen <jgoerzen at complete.org>	patch-9
 
     Summary:
diff --git a/libsrc/MissingH/Cmd.hs b/libsrc/MissingH/Cmd.hs
index 951a0e5..8f13a7d 100644
--- a/libsrc/MissingH/Cmd.hs
+++ b/libsrc/MissingH/Cmd.hs
@@ -99,7 +99,6 @@ pOpen :: PipeMode -> FilePath -> [String] ->
 pOpen pm fp args func =
     do
     pipepair <- createPipe
-    print pipepair
     fsth <- fdToHandle (fst pipepair)
     sndh <- fdToHandle (snd pipepair)
     case pm of
@@ -113,13 +112,9 @@ pOpen pm fp args func =
                                 callfunc
          WriteToPipe -> do 
                         let callfunc = do
-                                       print 112
                                        --hClose fsth
-                                       print 114
                                        x <- func sndh
-                                       print 116
                                        hClose sndh
-                                       print 118
                                        return x
                         pOpen3 (Just (fst pipepair)) Nothing Nothing fp args
                                callfunc
@@ -138,27 +133,19 @@ pOpen3 pin pout perr fp args func =
                                         dupTo fromfd tofd
                                         return ()
         childstuff = do
-                     putStrLn "child 123"
-                     putStrLn ("child " ++ fp)
                      mayberedir pin stdInput
                      mayberedir pout stdOutput
                      mayberedir perr stdError
-                     putStrLn "child 127"
                      debugM (logbase ++ ".pOpen3")
                             ("Running: " ++ fp ++ " " ++ (show args))
-                     putStrLn "child 130"
                      executeFile fp True args Nothing
-                     putStrLn "child 132"
                      exitFailure
         in
         do 
         pid <- forkProcess childstuff
-        putStrLn "Parent 138"
         retval <- func
         seq retval (return ())
-        putStrLn "Parent 140"
         status <- getProcessStatus True False pid
-        putStrLn "Parent 142"
         case status of
            Nothing -> fail "Got no process status back"
            Just (Exited (ExitSuccess)) -> return retval
diff --git a/libsrc/MissingH/Email/Sendmail.hs b/libsrc/MissingH/Email/Sendmail.hs
index e46566f..4c0d565 100644
--- a/libsrc/MissingH/Email/Sendmail.hs
+++ b/libsrc/MissingH/Email/Sendmail.hs
@@ -86,9 +86,9 @@ sendmail_worker args 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 sn args func)
 

-- 
haskell-testpack