[augeas-devel] augeas: master - Logrotate: small fixes

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=ca2cabd814c45a7b08b4da80013c53bd64d33689
Commit:        ca2cabd814c45a7b08b4da80013c53bd64d33689
Parent:        62684dad90d59c78875890d8d2bb4d239e868bae
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Wed Feb 18 14:13:23 2009 -0800
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Wed Feb 18 14:17:45 2009 -0800

Logrotate: small fixes

* recognize 'yearly' schedule
* allow whitespaces around { and }
---
 lenses/logrotate.aug |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lenses/logrotate.aug b/lenses/logrotate.aug
index b961913..fad8aa6 100644
--- a/lenses/logrotate.aug
+++ b/lenses/logrotate.aug
@@ -44,7 +44,7 @@ module Logrotate =
 
    let tabooext (indent:string) = [ del /[ \t]*/ indent . key "tabooext" . ( sep_spc . store /\+/ )? . list_item+ . eol ]
 
-   let attrs (indent:string) = select_to_eol "schedule" /(daily|weekly|monthly)/ indent
+   let attrs (indent:string) = select_to_eol "schedule" /(daily|weekly|monthly|yearly)/ indent
                 | value_to_eol "rotate" num indent
 		| create indent
 		| flag_to_eol "nocreate" indent
@@ -94,9 +94,9 @@ module Logrotate =
 
    (* Define rule *)
 
-   let body = Util.del_str "{\n"
+   let body = del /\{[ \t]*\n/ "{\n"
                        . ( comment "\t" | attrs "\t" | hooks | empty )*
-                       . Util.del_str "}\n"
+                       . del /[ \t]*\}[ \t]*\n/ "}\n"
 
    let rule = 
      [ label "rule" .