From: Michael Andres <ma@suse.de>
Date: Wed, 21 Dec 2011 16:52:11 +0000 (+0100)
Subject: Fix zypp.conf lens (bnc#687530)
X-Git-Tag: 1.7.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c032c5e14c6241984830c53973516382fae28af;p=platform%2Fupstream%2Fzypper.git

Fix zypp.conf lens (bnc#687530)
---

diff --git a/src/utils/zypper.aug b/src/utils/zypper.aug
index 14d2415..757ca76 100644
--- a/src/utils/zypper.aug
+++ b/src/utils/zypper.aug
@@ -53,10 +53,10 @@ module ZYpper =
   let commented  = [ label "commented" . del /#[ \t]*/ "# " . store_to_eol? . eol ]
 
   (* Matches key=value, creates a new node out of key and stores the value *)
-  let kv = [ key kw_re . del /[ \t]*=[ \t]*/ " = " . store /[^ \t\n]([^\n]*[^ \t\n])?/ . del_opt_ws ""  ]
+  let kv = [ del_opt_ws "" . key kw_re . del /[ \t]*=[ \t]*/ " = " . store /[^ \t\n]([^\n]*[^ \t\n])?/ . eol ]
 
   (* An option consists of ## description, # commented lines and an optionall key=value pair. *)
-  let option = [ seq "option" . description* . commented* . del_opt_ws "" . kv? . del_str "\n" ]
+  let option = [ seq "option" . description* . commented* . kv? ]
 
   (* ****************( section )*************** *)