From c4c8a7d8530a7270de6ab3eb8a5888c1dc8501fe Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Wed, 30 Nov 2011 16:42:11 +0100 Subject: [PATCH] Eat trailing whitespace in zypper.conf (bnc#687530) --- src/utils/zypper.aug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/zypper.aug b/src/utils/zypper.aug index 7ea74db..14d2415 100644 --- a/src/utils/zypper.aug +++ b/src/utils/zypper.aug @@ -53,7 +53,7 @@ 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]*/ ] + let kv = [ key kw_re . del /[ \t]*=[ \t]*/ " = " . store /[^ \t\n]([^\n]*[^ \t\n])?/ . del_opt_ws "" ] (* 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" ] -- 2.7.4