[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 e9b6fdb47b0b0857ef68028195f7f3894b4f5337
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Dec 2 00:07:22 2004 +0100

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

diff --git a/ChangeLog b/ChangeLog
index de62a03..35cef87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-12-01 17:07:22 GMT	John Goerzen <jgoerzen at complete.org>	patch-139
+
+    Summary:
+      Checkpointing
+    Revision:
+      missingh--head--0.5--patch-139
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/ConfigParser.hs
+     testsrc/ConfigParser/Maintest.hs
+
+
 2004-12-01 17:04:04 GMT	John Goerzen <jgoerzen at complete.org>	patch-138
 
     Summary:
diff --git a/libsrc/MissingH/ConfigParser.hs b/libsrc/MissingH/ConfigParser.hs
index 93798e4..5571d62 100644
--- a/libsrc/MissingH/ConfigParser.hs
+++ b/libsrc/MissingH/ConfigParser.hs
@@ -169,7 +169,7 @@ interpolatingAccess maxdepth cp s o =
                 x <- simpleAccess cp s o
                 case parse (interpmain lookupfunc) "(string)" x of
                      Left x -> throwError $ 
-                               (InterpolationError ("Unresolvable interpolation reference to \"" ++ error2str x ++ "\""),
+                               (InterpolationError ("unresolvable interpolation reference to \"" ++ error2str x ++ "\""),
                                 "interpolatingAccess")
                      Right x -> return x
 
diff --git a/testsrc/ConfigParser/Maintest.hs b/testsrc/ConfigParser/Maintest.hs
index 91bfc55..8ff7e38 100644
--- a/testsrc/ConfigParser/Maintest.hs
+++ b/testsrc/ConfigParser/Maintest.hs
@@ -140,7 +140,8 @@ test_interp =
                     "filename = test_%(arch)s.c\n" ++
                     "dir = /usr/src/%(filename)s\n" ++
                     "percent = 5%%\n" ++
-                    "bad = /usr/src/%(nonexistent)s"
+                    "bad = /usr/src/%(nonexistent)s\n" ++
+                    "recursive = foo%(recursive)s\n"
         cp = (forceEither $ (readstring emptyCP interpdoc)){ accessfunc = interpolatingAccess 5}
         in
         [
@@ -148,7 +149,9 @@ test_interp =
         ,f2 "filename" (Right "test_i386.c") (get cp "builder" "filename")
         ,f2 "dir" (Right "/usr/src/test_i386.c") (get cp "builder" "dir")
         ,f2 "percents" (Right "5%") (get cp "builder" "percent")
-        ,f2 "error" (Left (InterpolationError "Unresolvable interpolation reference to \"nonexistent\"", "interpolatingAccess")) (get cp "builder" "bad")
+        ,f2 "error" (Left (InterpolationError "unresolvable interpolation reference to \"nonexistent\"", "interpolatingAccess")) (get cp "builder" "bad")
+        ,f2 "recursive" (Left (InterpolationError "unresolvable interpolation reference to \"recursive\"", "interpolatingAccess"))
+                        (get cp "builder" "recursive")
         ]
 
 

-- 
haskell-testpack