Merge pull request #341 from ancorgs/newline_12_3

Merge of fix for bnc#912169 into 13.2
yast · Feb 3, 2015 · 3c1ac43 · 3c1ac43
2 parents 5d93dfa + 039543d
commit 3c1ac43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/library/system/src/clients/view_anymsg.rb b/library/system/src/clients/view_anymsg.rb
@@ -186,8 +186,8 @@ def main
           # remove ANSI color escape sequences
           file_content.gsub!(/\e\[(\d|;|\[)+m/, "")
           # remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL))
-          # (except new line, CR = 0xd)
-          file_content.tr!("\u0000-\u000c\u000e-\u001f\u007f", "")
+          # except new line (LF = 0xa) and carriage return (CR = 0xd)
+          file_content.tr!("\u0000-\u0009\u000b\u000c\u000e-\u001f\u007f", "")
         else
           file_content = _("File not found.")
         end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  3 10:15:13 UTC 2015 - ancor@suse.com
+
+- Better handling of line breaks in system log viewer (bnc#912169)
+- 3.1.109.1
+
 -------------------------------------------------------------------
 Mon Jan 26 14:16:20 UTC 2015 - jreidinger@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.109
+Version:        3.1.109.1
 Release:        0
 URL:            https://github.com/yast/yast-yast2