[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 f0e45d1ed8c89c7d9a0800ff57b9473ed089073f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Dec 22 09:58:04 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index 5d858a8..ff40c96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-22 02:58:04 GMT	John Goerzen <jgoerzen at complete.org>	patch-140
+
+    Summary:
+      Checkpointing
+    Revision:
+      missingh--head--0.7--patch-140
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/IO/HVFS/Combinators.hs
+     testsrc/HVFStest.hs
+
+
 2004-12-22 02:46:33 GMT	John Goerzen <jgoerzen at complete.org>	patch-139
 
     Summary:
diff --git a/libsrc/MissingH/IO/HVFS/Combinators.hs b/libsrc/MissingH/IO/HVFS/Combinators.hs
index 01502e1..5e07d62 100644
--- a/libsrc/MissingH/IO/HVFS/Combinators.hs
+++ b/libsrc/MissingH/IO/HVFS/Combinators.hs
@@ -78,13 +78,15 @@ newHVFSChroot fh fp =
 dch (HVFSChroot _ a) = a
 
 {- | Convert a local (chroot) path to a full path. -}
-dch2fp (HVFSChroot fp h) locfp = 
+dch2fp mainh@(HVFSChroot fp h) locfp = 
     do full <- case (head locfp) of
                   '/' -> return (fp ++ locfp)
-                  x -> getFullPath h locfp
+                  x -> do y <- getFullPath mainh locfp
+                          return $ fp ++ y
        case secureAbsNormPath fp full of
            Nothing -> vRaiseError h doesNotExistErrorType  
-                        ("Trouble normalizing path") (Just (fp ++ "/" ++ full))
+                        ("Trouble normalizing path in chroot")
+                        (Just (fp ++ "," ++ full))
            Just x -> return x
 
 {- | Convert a full path to a local (chroot) path. -}
diff --git a/testsrc/HVFStest.hs b/testsrc/HVFStest.hs
index b1168dc..5bddef5 100644
--- a/testsrc/HVFStest.hs
+++ b/testsrc/HVFStest.hs
@@ -86,6 +86,10 @@ test_chroot =
                     "/dir2" @=? cwd
                     y <- vGetDirectoryContents x "."
                     [] @=? y
+                    vSetCurrentDirectory x ".."
+                    "/" `ioeq` vGetCurrentDirectory x
+                    --vSetCurrentDirectory x ".."
+                    --"/" `ioeq` vGetCurrentDirectory x
           )
         --,f "test.txt" (\x -> "subdir test" `ioeq` 
         --               (vOpen x "/test.txt" ReadMode >>= vGetContents))

-- 
haskell-testpack