[augeas-devel] augeas: master - Normalise records so that empty lines (which are a required part of the syntax) don't creep into the tree

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=9ed27cb8186b09d74e5dc1c9c21fc35d9a8328f9
Commit:        9ed27cb8186b09d74e5dc1c9c21fc35d9a8328f9
Parent:        74e4aca7fa06e823ad9a03d05972da2bfca4c244
Author:        Matt Palmer <mpalmer at hezmatt.org>
AuthorDate:    Wed Nov 25 01:24:40 2009 +1100
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Tue Nov 24 09:03:08 2009 -0800

Normalise records so that empty lines (which are a required part of the syntax) don't creep into the tree

---
 lenses/aptpreferences.aug            |    3 +--
 lenses/tests/test_aptpreferences.aug |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/lenses/aptpreferences.aug b/lenses/aptpreferences.aug
index dd04595..32ace01 100644
--- a/lenses/aptpreferences.aug
+++ b/lenses/aptpreferences.aug
@@ -40,10 +40,9 @@ module AptPreferences =
    let record = [ seq "record" . entries+ ]
 
    (* Define lens *)
-   let lns = empty* . ( record . empty )* . record?
+   let lns = eol* . ( record . eol+ )* . record . eol*
 
    let filter = incl "/etc/apt/preferences"
               . Util.stdexcl
 
    let xfm = transform lns filter
-
diff --git a/lenses/tests/test_aptpreferences.aug b/lenses/tests/test_aptpreferences.aug
index 0a7f248..27478b0 100644
--- a/lenses/tests/test_aptpreferences.aug
+++ b/lenses/tests/test_aptpreferences.aug
@@ -29,7 +29,6 @@ Pin-Priority: 600
               { "l" = "Raphink" }
               { "v" = "3.0"     } }
           { "Pin-Priority" = "700" } }
-       {}
        { "3"
           { "Package"      = "liferea-data" }
           { "Pin"          = "version"