[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 479dc9f0277280782101cd780d6c6d951c172feb
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Oct 27 03:16:45 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index a161717..2b3f1fb 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 21:16:45 GMT	John Goerzen <jgoerzen at complete.org>	patch-14
+
+    Summary:
+      Checkpointing again
+    Revision:
+      missingh--head--0.5--patch-14
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Cmd.hs
+     libsrc/MissingH/Email/Sendmail.hs
+
+
 2004-10-26 21:15:23 GMT	John Goerzen <jgoerzen at complete.org>	patch-13
 
     Summary:
diff --git a/libsrc/MissingH/Cmd.hs b/libsrc/MissingH/Cmd.hs
index eb7581f..642db2c 100644
--- a/libsrc/MissingH/Cmd.hs
+++ b/libsrc/MissingH/Cmd.hs
@@ -93,7 +93,6 @@ Passes the handle on to the specified function.
 The 'PipeMode' specifies what you will be doing.  That is, specifing 'ReadFromPipe' 
 sets up a pipe from stdin, and 'WriteToPipe' sets up a pipe from stdout.
 
-FIXME: this slowly leaks FDs!
  -}
 pOpen :: PipeMode -> FilePath -> [String] -> 
          (Handle -> IO a) -> IO a
@@ -112,15 +111,10 @@ pOpen pm fp args func =
                                 callfunc
          WriteToPipe -> do 
                         let callfunc _ = do
-                                       print 114
                                        closeFd (fst pipepair)
-                                       print 116
                                        h <- fdToHandle (snd pipepair)
-                                       print 118
                                        x <- func h
-                                       print 120
                                        hClose h
-                                       print 122
                                        return $! x
                         pOpen3 (Just (fst pipepair)) Nothing Nothing fp args
                                callfunc
@@ -144,26 +138,19 @@ pOpen3 pin pout perr fp args func =
                      mayberedir perr stdError
                      debugM (logbase ++ ".pOpen3")
                             ("Running: " ++ fp ++ " " ++ (show args))
-                     print 141
                      catch (executeFile fp True args Nothing) (\_ -> return ())
-                     print 143
                      exitFailure
-                     print 144
         in
         do 
         System.Posix.Signals.installHandler
                       System.Posix.Signals.sigPIPE
                       System.Posix.Signals.Ignore
                       Nothing
-        print 145
         p <- try (forkProcess childstuff)
-        print 147
         pid <- case p of
                 Right x -> return x
                 Left e -> fail ("Error in fork: " ++ (show e))
-        print 150
         retval <- func $! pid
-        print 152
         let rv = seq retval retval
         status <- getProcessStatus True False $! (seq retval pid)
         case status of
diff --git a/libsrc/MissingH/Email/Sendmail.hs b/libsrc/MissingH/Email/Sendmail.hs
index 20945ab..2ffe802 100644
--- a/libsrc/MissingH/Email/Sendmail.hs
+++ b/libsrc/MissingH/Email/Sendmail.hs
@@ -94,11 +94,8 @@ sendmail_worker args msg =
         --pOpen WriteToPipe "/usr/sbin/sendmail" args func
         rv <- try (pOpen WriteToPipe "sendmail" args func)
         case rv of
-            Right x -> do
-                       print 1
-                       return x
+            Right x -> return x
             Left _ -> do
-                      print 2
                       sn <- findsendmail
                       rv <- pOpen WriteToPipe sn args func
                       return $! rv

-- 
haskell-testpack