[augeas-devel] augeas: master - Logrotate: allow filenames to be indented

David Lutterkort lutter at fedoraproject.org
Wed Jul 8 19:28:24 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=93eb1a22df834a5e55a1e90158270c40e934ade4
Commit:        93eb1a22df834a5e55a1e90158270c40e934ade4
Parent:        060496603fedb966ab7ac51e3effe02e6a578332
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Wed Jul 8 12:21:54 2009 -0700
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Wed Jul 8 12:21:54 2009 -0700

Logrotate: allow filenames to be indented

  * lenses/logrotate.aug (rule): allow indentation at start of rule
  * lenses/tests/test_logrotate.aug: add tests

Fixes part of bug #67 reported by Micah
---
 lenses/logrotate.aug            |    3 +--
 lenses/tests/test_logrotate.aug |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lenses/logrotate.aug b/lenses/logrotate.aug
index 55d3016..1ee2b99 100644
--- a/lenses/logrotate.aug
+++ b/lenses/logrotate.aug
@@ -100,7 +100,7 @@ module Logrotate =
                        . del /[ \t]*\}[ \t]*\n/ "}\n"
 
    let rule =
-     [ label "rule" .
+     [ label "rule" . Util.indent .
          [ label "file" . store word ] .
 	 [ del /[ \t]+/ " " . label "file" . store word ]* .
 	 del /[ \t\n]*/ " " . body ]
@@ -112,4 +112,3 @@ module Logrotate =
 	      . Util.stdexcl
 
    let xfm = transform lns filter
-
diff --git a/lenses/tests/test_logrotate.aug b/lenses/tests/test_logrotate.aug
index 4c72318..85036ed 100644
--- a/lenses/tests/test_logrotate.aug
+++ b/lenses/tests/test_logrotate.aug
@@ -138,8 +138,8 @@ include /etc/logrotate.d
       { "file" = "/avr/log/wtmp" }
       { "minsize" = "1M" } }
 
-  (* '=' is a legal seaprator *)
-   test Logrotate.lns get "/file {\n size=5M\n}\n" =
+  (* '=' is a legal separator, file names can be indented *)
+   test Logrotate.lns get " \t /file {\n size=5M\n}\n" =
      { "rule"
          { "file" = "/file" }
          { "size" = "5M" } }




More information about the augeas-devel mailing list