[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 527d8823e57bdc3170f611dbb31d670f7985af38
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Nov 24 11:29:50 2006 +0100

    Fix minor syntax errors

diff --git a/MissingH/Cmd.hs b/MissingH/Cmd.hs
index 0334195..aef58b1 100644
--- a/MissingH/Cmd.hs
+++ b/MissingH/Cmd.hs
@@ -96,7 +96,7 @@ module MissingH.Cmd(-- * High-Level Tools
                     PipeMode(..),
 #ifndef mingw32_HOST_OS
 #ifndef __HUGS__
-                    pOpen, pOpen3
+                    pOpen, pOpen3, pOpen3Raw
 #endif
 #endif
 		   )
diff --git a/MissingH/ProgressMeter.hs b/MissingH/ProgressMeter.hs
index 1fa17d6..6bb6645 100644
--- a/MissingH/ProgressMeter.hs
+++ b/MissingH/ProgressMeter.hs
@@ -188,14 +188,14 @@ renderMeterR meter =
           rendercomponent :: (Integer -> String) -> Progress -> IO String
           rendercomponent rfunc pt = withStatus pt $ \pts ->
               do pct <- renderpctpts pts
-                 let u = unit pts
+                 let u = unit meter
                  return $ "[" ++ trackerName pts ++ " " ++
                      rfunc (completedUnits pts) ++ u ++ "/" ++
                      rfunc (totalUnits pts) ++ u ++ " " ++ pct ++ "]"
           renderoverall rfunc pt = withStatus pt $ \pts ->
               do etr <- getETR pts
                  speed <- getSpeed pts
-                 return $ rfunc (floor speed) ++ (unit pts) ++ 
+                 return $ rfunc (floor speed) ++ (unit meter) ++ 
                             "/s " ++ renderSecs etr
 
 

-- 
haskell-testpack