[augeas-devel] [PATCH] Merged ldap.aug in spacevars.aug and added havp.config to the list of supported configuration files

[David Lutterkort]

On Sat, 2008-09-06 at 15:27 +0200, Free Ekanayaka wrote: 
> # HG changeset patch
> # User Free Ekanayaka <free at 64studio.com>
> # Date 1220706462 -7200
> # Node ID 57a2a968ed195b7d5cfc33d4bb19e695d55bdc16
> # Parent  b6948438f552e227788110984a1733cb25f2f021
> Merged ldap.aug in spacevars.aug and added havp.config to the list of
> supported configuration files

ACK, committed. The test Test_ldap was still referencing Ldap.lns, which
(a) prompted me to add the --nodstdinc option so that this is guaranteed
to cause a test failure and (b) made me change your patch by doing this
on top of it:

diff -r 9650082ba6da lenses/spacevars.aug
--- a/lenses/spacevars.aug	Sat Sep 06 15:07:42 2008 +0200
+++ b/lenses/spacevars.aug	Mon Sep 08 16:49:46 2008 -0700
@@ -36,10 +36,12 @@
 
 let lns (entry:lens) = (comment|empty|entry) *
 
+let simple_lns = lns (entry entry_re)
+
 (* configuration files that can be parsed without customizing the lens *)
 let filter = Util.stdexcl
            . incl "/etc/havp/havp.config"
            . incl "/etc/ldap.conf"
            . incl "/etc/ldap/ldap.conf"
 
-let xfm = transform (lns (entry (entry_re))) filter
+let xfm = transform simple_lns filter
diff -r 9650082ba6da lenses/tests/test_ldap.aug
--- a/lenses/tests/test_ldap.aug	Sat Sep 06 15:07:42 2008 +0200
+++ b/lenses/tests/test_ldap.aug	Mon Sep 08 16:49:46 2008 -0700
@@ -9,7 +9,7 @@
 pam_password md5
 "
 
-test Ldap.lns get conf =
+test Spacevars.simple_lns get conf =
   { "host" = "127.0.0.1" }
   {}
   { "#comment" = "The distinguished name of the search base." }