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

[Free Ekanayaka]

|--==> On Mon, 08 Sep 2008 16:54:21 -0700, David Lutterkort <lutter at redhat.com> said:

  DL> 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

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

Oh, didn't notice that! Thanks for your careful review.

Ciao,

Free

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