Merge pull request #11 from yast/fix_killing_12

Fix killing 12
yast · Jan 26, 2015 · b64110e · b64110e
2 parents cb9d1dd + 063436a
commit b64110e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/package/yast2-multipath.changes b/package/yast2-multipath.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 26 12:26:32 UTC 2015 - jreidinger@suse.com
+
+- fixed \r character lost during conversion to Ruby
+
 -------------------------------------------------------------------
 Thu Oct 30 02:30:24 UTC 2014 - nwang@suse.com
 

diff --git 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)