[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 3d4d82c56a7bc99d2f4527a061ef415d54f3c79b
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Dec 24 00:37:25 2004 +0100

    Checkpointing ReadOnly cleanup
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-157)

diff --git a/ChangeLog b/ChangeLog
index f3a635a..acc5313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-23 17:37:25 GMT	John Goerzen <jgoerzen at complete.org>	patch-157
+
+    Summary:
+      Checkpointing ReadOnly cleanup
+    Revision:
+      missingh--head--0.7--patch-157
+
+
+    modified files:
+     ChangeLog ftptest.hs libsrc/MissingH/IO/HVFS/Combinators.hs
+     libsrc/MissingH/IO/HVFS/Utils.hs libsrc/MissingH/Path.hs
+
+
 2004-12-23 17:33:24 GMT	John Goerzen <jgoerzen at complete.org>	patch-156
 
     Summary:
diff --git a/ftptest.hs b/ftptest.hs
index 76ff1d5..5e13dbb 100644
--- a/ftptest.hs
+++ b/ftptest.hs
@@ -3,6 +3,7 @@ import MissingH.Network.FTP.Server
 import MissingH.Network.SocketServer
 import MissingH.Logging.Logger
 import MissingH.IO.HVFS
+import MissingH.IO.HVFS.Combinators
 
 main = do
        updateGlobalLogger "" (setLevel DEBUG)
@@ -12,4 +13,4 @@ main = do
             threadedHandler $ 
             loggingHandler "" INFO $
             handleHandler $
-            anonFtpHandler (SystemFS)
+            anonFtpHandler (HVFSReadOnly SystemFS)
diff --git a/libsrc/MissingH/IO/HVFS/Combinators.hs b/libsrc/MissingH/IO/HVFS/Combinators.hs
index 362b510..8753fa9 100644
--- a/libsrc/MissingH/IO/HVFS/Combinators.hs
+++ b/libsrc/MissingH/IO/HVFS/Combinators.hs
@@ -34,7 +34,7 @@ Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org
 
 module MissingH.IO.HVFS.Combinators(
                                     -- * Restrictions
-                                    HVFSReadOnly,
+                                    HVFSReadOnly(..),
                                     HVFSChroot, newHVFSChroot
                                    )
 where
diff --git a/libsrc/MissingH/IO/HVFS/Utils.hs b/libsrc/MissingH/IO/HVFS/Utils.hs
index 28d7eff..adccd66 100644
--- a/libsrc/MissingH/IO/HVFS/Utils.hs
+++ b/libsrc/MissingH/IO/HVFS/Utils.hs
@@ -38,7 +38,7 @@ first parameter to these functions.
 module MissingH.IO.HVFS.Utils (recurseDir,
                                recurseDirStat,
                                recursiveRemove,
-                               SystemFS
+                               SystemFS(..)
                               )
 where
 
diff --git a/libsrc/MissingH/Path.hs b/libsrc/MissingH/Path.hs
index 4e18148..f80af56 100644
--- a/libsrc/MissingH/Path.hs
+++ b/libsrc/MissingH/Path.hs
@@ -50,7 +50,6 @@ import Control.Exception
 import System.IO
 import MissingH.Path.NameManip
 import MissingH.IO.HVFS.Utils
-import MissingH.IO.HVFS
 
 {- | Splits a pathname into a tuple representing the root of the name and
 the extension.  The extension is considered to be all characters from the last

-- 
haskell-testpack