From 25faa5ffecee564d01ab0b0d5a51997ed9589073 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Jan 2015 13:23:38 +0100 Subject: [PATCH 1/3] fix ycp killing bug with changing \r with space --- src/include/multipath/options.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/multipath/options.rb b/src/include/multipath/options.rb index c645cf7..6468afd 100644 --- a/src/include/multipath/options.rb +++ b/src/include/multipath/options.rb @@ -686,7 +686,7 @@ def rm_quotes(value) str_end = Ops.subtract(str_len, 1) while Ops.less_than(str_start, str_len) cur_char = Builtins.substring(value, str_start, 1) - if cur_char == " " || cur_char == "\t" || cur_char == " " || + if cur_char == " " || cur_char == "\t" || cur_char == "\r" || cur_char == "\n" || cur_char == "\"" str_start = Ops.add(str_start, 1) @@ -697,7 +697,7 @@ def rm_quotes(value) while Ops.greater_than(str_end, str_start) cur_char = Builtins.substring(value, str_end, 1) - if cur_char == " " || cur_char == "\t" || cur_char == " " || + if cur_char == " " || cur_char == "\t" || cur_char == "\r" || cur_char == "\n" || cur_char == "\"" str_end = Ops.subtract(str_end, 1) From 11edbdc700ec7af4c68d9a2c9bcb8ce64f84745a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Jan 2015 13:27:18 +0100 Subject: [PATCH 2/3] changes --- package/yast2-multipath.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/yast2-multipath.changes b/package/yast2-multipath.changes index 4250e27..0cf3675 100644 --- a/package/yast2-multipath.changes +++ b/package/yast2-multipath.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 26 12:26:32 UTC 2015 - jreidinger@suse.com + +- fix removing \r character accidentally removed during conversion + to ruby + ------------------------------------------------------------------- Thu Oct 30 02:30:24 UTC 2014 - nwang@suse.com From 063436ae3ac043880c0dc66e9b6b2448324d6fe9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Jan 2015 13:42:01 +0100 Subject: [PATCH 3/3] better changelog entry --- package/yast2-multipath.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/yast2-multipath.changes b/package/yast2-multipath.changes index 0cf3675..4383ae5 100644 --- a/package/yast2-multipath.changes +++ b/package/yast2-multipath.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Mon Jan 26 12:26:32 UTC 2015 - jreidinger@suse.com -- fix removing \r character accidentally removed during conversion - to ruby +- fixed \r character lost during conversion to Ruby ------------------------------------------------------------------- Thu Oct 30 02:30:24 UTC 2014 - nwang@suse.com