[augeas-devel] augeas: master - AptPreferences: add a put test

David Lutterkort lutter at fedoraproject.org
Wed Nov 25 23:52:23 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=9209d5f6ecb7a78ad9643cb078196e3e0d21fb22
Commit:        9209d5f6ecb7a78ad9643cb078196e3e0d21fb22
Parent:        9ed27cb8186b09d74e5dc1c9c21fc35d9a8328f9
Author:        Matt Palmer <mpalmer at hezmatt.org>
AuthorDate:    Thu Nov 26 06:45:27 2009 +1100
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Wed Nov 25 15:50:41 2009 -0800

AptPreferences: add a put test

Make sure we handle an empty file properly, and cleanup the resulting
hassle
---
 lenses/aptpreferences.aug            |    2 +-
 lenses/tests/test_aptpreferences.aug |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/lenses/aptpreferences.aug b/lenses/aptpreferences.aug
index 32ace01..7bb8daf 100644
--- a/lenses/aptpreferences.aug
+++ b/lenses/aptpreferences.aug
@@ -40,7 +40,7 @@ module AptPreferences =
    let record = [ seq "record" . entries+ ]
 
    (* Define lens *)
-   let lns = eol* . ( record . eol+ )* . record . eol*
+   let lns = (eol* . ( record . eol+ )* . record . eol* ) | eol
 
    let filter = incl "/etc/apt/preferences"
               . Util.stdexcl
diff --git a/lenses/tests/test_aptpreferences.aug b/lenses/tests/test_aptpreferences.aug
index 27478b0..e65be43 100644
--- a/lenses/tests/test_aptpreferences.aug
+++ b/lenses/tests/test_aptpreferences.aug
@@ -34,3 +34,15 @@ Pin-Priority: 600
           { "Pin"          = "version"
               { "version" = "1.4.26-4" } }
           { "Pin-Priority" = "600" } }
+
+(*************************************************************************)
+
+    test AptPreferences.lns put "\n" after
+       set "/1/Package" "something-funny";
+       set "/1/Pin" "version";
+       set "/1/Pin/version" "1.2.3-4";
+       set "/1/Pin-Priority" "2000"
+    = "Package: something-funny
+Pin: version 1.2.3-4
+Pin-Priority: 2000
+"




More information about the augeas-devel mailing list