[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 6c59c26247f836d70ff059101bffaf367aef1478
Author: John Goerzen <jgoerzen at complete.org>
Date:   Mon Dec 4 01:44:26 2006 +0100

    Fix Glob to use new FilePath API
    
    splitFileName was now leaving a trailing slash on the directory name.
    takeDirectory and takeFileName don't do that, so switched to using them.
    
    unit tests caught this problem

diff --git a/src/System/Path/Glob.hs b/src/System/Path/Glob.hs
index eb9efc4..ab6fdc1 100644
--- a/src/System/Path/Glob.hs
+++ b/src/System/Path/Glob.hs
@@ -35,7 +35,7 @@ module System.Path.Glob(glob, vGlob) where
 import Data.List.Utils
 import System.IO
 import System.IO.HVFS
-import System.FilePath
+import System.FilePath.Version_0_11
 import Control.Exception
 import System.Path.WildMatch
 
@@ -79,7 +79,8 @@ expandGlob fs fn =
                  else do r <- mapM expandNormalBase dirlist
                          return $ concat r
            
-    where (dirname, basename) = splitFileName fn
+    where basename = takeBaseName fn
+          dirname = takeDirectory fn
           expandWildBase :: FilePath -> IO [FilePath]
           expandWildBase dname =
               do dirglobs <- runGlob fs dname basename

-- 
haskell-testpack